Merge pull request #57 from A1EF/master

Bump SaltStack version to `3006.1`

Author: grandmotivator

README.md

@@ -4,7 +4,7 @@
 [![Kitchen (Linux)](https://github.com/opensourcewebsite-org/osw-devops/actions/workflows/kitchen.yml/badge.svg)](https://github.com/opensourcewebsite-org/osw-devops/actions/workflows/kitchen.yml)
 
 [![License](https://img.shields.io/badge/License-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
-[![SaltStack Version](https://img.shields.io/badge/SaltStack-3005.1-blue.svg?style=flat-square)](https://saltproject.io)
+[![SaltStack Version](https://img.shields.io/badge/SaltStack-3006.1-blue.svg?style=flat-square)](https://saltproject.io)
 
 Server Architecture for OpenSourceWebsite, using [SaltStack](https://saltproject.io).
 

install.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 UBUNTU_VERSION=$(grep -F VERSION_ID /etc/os-release | cut -d\" -f2)
 UBUNTU_CODENAME=$(grep -F VERSION_CODENAME /etc/os-release | cut -d= -f2)
-SALT_RELEASE='3005'
+SALT_RELEASE='3006'
 
 apt-get update
 apt-get full-upgrade -y
@@ -14,10 +14,10 @@ if ! [[ -d /etc/apt/keyrings ]]; then
   mkdir /etc/apt/keyrings
 fi
 
-wget -qO /etc/apt/keyrings/salt-archive-keyring.gpg "https://repo.saltproject.io/salt/py3/ubuntu/${UBUNTU_VERSION}/amd64/${SALT_RELEASE}/salt-archive-keyring.gpg"
+wget -qO /etc/apt/keyrings/salt-archive-keyring-2023.gpg "https://repo.saltproject.io/salt/py3/ubuntu/${UBUNTU_VERSION}/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg"
 
 cat <<EOF > /etc/apt/sources.list.d/salt.list
-deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/${UBUNTU_VERSION}/amd64/${SALT_RELEASE} ${UBUNTU_CODENAME} main
+deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/${UBUNTU_VERSION}/amd64/${SALT_RELEASE} ${UBUNTU_CODENAME} main
 EOF
 
 apt-get update
@@ -42,13 +42,13 @@ gitfs_remotes:
   - https://github.com/saltstack-formulas/users-formula.git
   - https://github.com/saltstack-formulas/logrotate-formula.git
   - https://github.com/opensourcewebsite-org/osw-devops.git:
-    - root: salt
+      - root: salt
 
 pillarenv_from_saltenv: True
 ext_pillar:
   - git:
     - https://github.com/opensourcewebsite-org/osw-devops.git:
-      - root: pillar
+        - root: pillar
 EOF
 
 salt-pip install GitPython
@@ -65,7 +65,7 @@ systemctl restart salt-minion
 
 sleep 60
 
-salt-key -a opensourcewebsite.org -y
+salt-key -ay opensourcewebsite.org
 
 # Swap
 if ! [[ -f /swapfile ]]; then

pillar/prod/salt.sls

@@ -6,8 +6,8 @@ salt:
   master_remove_config: false
   install_packages: true
   py_ver: 'py3'
-  version: 3005.1+ds-4
-  release: '3005.1'
+  version: 3006.1
+  release: '3006.1'
   lookup:
     salt_master: 'salt-master'
     salt_minion: 'salt-minion'

pillar/salt.sls

@@ -6,8 +6,8 @@ salt:
   master_remove_config: false
   install_packages: true
   py_ver: 'py3'
-  version: 3005.1+ds-4
-  release: '3005.1'
+  version: 3006.1
+  release: '3006.1'
   lookup:
     salt_minion: 'salt-minion'
   minion: