From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 21 Dec 2023 11:49:44 +0000 (+0100)
Subject: committing changes in /etc made by "/usr/bin/python3 /usr/bin/nala upgrade --purge"
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=46844c6d44937eb13ae33ca4c5071b192f9aece6;p=config%2Fns3%2Fetc.git

committing changes in /etc made by "/usr/bin/python3 /usr/bin/nala upgrade --purge"

Packages with configuration changes:
-salt-master 3006.4 amd64
-salt-minion 3006.4 amd64
+salt-master 3006.5 amd64
+salt-minion 3006.5 amd64

Package changes:
-linux-image-amd64 6.1.66-1 amd64
-linux-libc-dev 6.1.66-1 amd64
+linux-image-6.1.0-16-amd64 6.1.67-1 amd64
+linux-image-amd64 6.1.67-1 amd64
+linux-libc-dev 6.1.67-1 amd64
-salt-common 3006.4 amd64
-salt-master 3006.4 amd64
-salt-minion 3006.4 amd64
-salt-ssh 3006.4 amd64
+salt-common 3006.5 amd64
+salt-master 3006.5 amd64
+salt-minion 3006.5 amd64
+salt-ssh 3006.5 amd64
---

diff --git a/.etckeeper b/.etckeeper
index 92d7d1b..3541e58 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1516,9 +1516,7 @@ maybe chmod 0644 'logrotate.d/fail2ban'
 maybe chmod 0644 'logrotate.d/ftp-backup'
 maybe chmod 0644 'logrotate.d/icinga2'
 maybe chmod 0644 'logrotate.d/rsyslog'
-maybe chmod 0755 'logrotate.d/salt'
 maybe chmod 0644 'logrotate.d/salt-common'
-maybe chmod 0644 'logrotate.d/salt/salt-common.logrotate'
 maybe chmod 0644 'logrotate.d/ulogd2'
 maybe chmod 0644 'logrotate.d/wtmp'
 maybe chmod 0755 'logwatch'
@@ -2023,8 +2021,7 @@ maybe chmod 0755 'ufw/applications.d'
 maybe chmod 0644 'ufw/applications.d/bind9'
 maybe chmod 0644 'ufw/applications.d/openssh-server'
 maybe chmod 0644 'ufw/applications.d/postfix'
-maybe chmod 0755 'ufw/applications.d/salt-master'
-maybe chmod 0644 'ufw/applications.d/salt-master/salt.ufw'
+maybe chmod 0644 'ufw/applications.d/salt.ufw'
 maybe chmod 0600 'ulogd.conf'
 maybe chmod 0755 'update-motd.d'
 maybe chmod 0755 'update-motd.d/10-uname'
diff --git a/logrotate.d/salt/salt-common.logrotate b/logrotate.d/salt/salt-common.logrotate
deleted file mode 100644
index 1bc063e..0000000
--- a/logrotate.d/salt/salt-common.logrotate
+++ /dev/null
@@ -1,50 +0,0 @@
-/var/log/salt/master {
-	weekly
-	missingok
-	rotate 7
-	compress
-	notifempty
-	create 0640 salt salt
-}
-
-/var/log/salt/minion {
-	weekly
-	missingok
-	rotate 7
-	compress
-	notifempty
-}
-
-/var/log/salt/key {
-	weekly
-	missingok
-	rotate 7
-	compress
-	notifempty
-	create 0640 salt salt
-}
-
-/var/log/salt/api {
-	weekly
-	missingok
-	rotate 7
-	compress
-	notifempty
-	create 0640 salt salt
-}
-
-/var/log/salt/syndic {
-	weekly
-	missingok
-	rotate 7
-	compress
-	notifempty
-}
-
-/var/log/salt/proxy {
-	weekly
-	missingok
-	rotate 7
-	compress
-	notifempty
-}
diff --git a/salt/master b/salt/master
index 4f0fa64..41cf4da 100644
--- a/salt/master
+++ b/salt/master
@@ -1198,7 +1198,7 @@ user: salt
 # One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
 #
 # The following log levels are considered INSECURE and may log sensitive data:
-# ['garbage', 'trace', 'debug']
+# ['profile', 'garbage', 'trace', 'debug', 'all']
 #
 #log_level: warning
 
diff --git a/salt/minion b/salt/minion
index eeef626..a54f165 100644
--- a/salt/minion
+++ b/salt/minion
@@ -809,7 +809,7 @@
 # One of 'garbage', 'trace', 'debug', 'info', 'warning', 'error', 'critical'.
 #
 # The following log levels are considered INSECURE and may log sensitive data:
-# ['garbage', 'trace', 'debug']
+# ['profile', 'garbage', 'trace', 'debug', 'all']
 #
 # Default: 'warning'
 #log_level: warning
diff --git a/salt/proxy b/salt/proxy
index 47d6ac6..0cfe7b1 100644
--- a/salt/proxy
+++ b/salt/proxy
@@ -545,7 +545,7 @@
 # One of 'garbage', 'trace', 'debug', 'info', 'warning', 'error', 'critical'.
 #
 # The following log levels are considered INSECURE and may log sensitive data:
-# ['garbage', 'trace', 'debug']
+# ['profile', 'garbage', 'trace', 'debug', 'all']
 #
 # Default: 'warning'
 #log_level: warning
diff --git a/ufw/applications.d/salt-master/salt.ufw b/ufw/applications.d/salt-master/salt.ufw
deleted file mode 100644
index 9dd120c..0000000
--- a/ufw/applications.d/salt-master/salt.ufw
+++ /dev/null
@@ -1,6 +0,0 @@
-# Install into /etc/ufw/applications.d/ and run 'ufw app update' to add salt
-# firewall rules to systems with UFW.  Activate with 'ufw allow salt'
-[Salt]
-title=salt
-description=fast and powerful configuration management and remote execution
-ports=4505,4506/tcp
diff --git a/ufw/applications.d/salt.ufw b/ufw/applications.d/salt.ufw
new file mode 100644
index 0000000..9dd120c
--- /dev/null
+++ b/ufw/applications.d/salt.ufw
@@ -0,0 +1,6 @@
+# Install into /etc/ufw/applications.d/ and run 'ufw app update' to add salt
+# firewall rules to systems with UFW.  Activate with 'ufw allow salt'
+[Salt]
+title=salt
+description=fast and powerful configuration management and remote execution
+ports=4505,4506/tcp