committing changes in /etc after apt run

Package changes:
-apache2 2.4.10-10+deb8u8
-apache2-bin 2.4.10-10+deb8u8
-apache2-data 2.4.10-10+deb8u8
-apache2-utils 2.4.10-10+deb8u8
+apache2 2.4.10-10+deb8u9
+apache2-bin 2.4.10-10+deb8u9
+apache2-data 2.4.10-10+deb8u9
+apache2-utils 2.4.10-10+deb8u9
-bind9 1:9.9.5.dfsg-9+deb8u11
-bind9-host 1:9.9.5.dfsg-9+deb8u11
-bind9utils 1:9.9.5.dfsg-9+deb8u11
+bind9 1:9.9.5.dfsg-9+deb8u12
+bind9-host 1:9.9.5.dfsg-9+deb8u12
+bind9utils 1:9.9.5.dfsg-9+deb8u12
-debian-archive-keyring 2014.3
+debian-archive-keyring 2017.5~deb8u1
-dnsutils 1:9.9.5.dfsg-9+deb8u11
+dnsutils 1:9.9.5.dfsg-9+deb8u12
-libbind9-90 1:9.9.5.dfsg-9+deb8u11
+libbind9-90 1:9.9.5.dfsg-9+deb8u12
-libc-bin 2.19-18+deb8u9
-libc6 2.19-18+deb8u9
+libc-bin 2.19-18+deb8u10
+libc6 2.19-18+deb8u10
-libdns-export100 1:9.9.5.dfsg-9+deb8u11
-libdns100 1:9.9.5.dfsg-9+deb8u11
+libdns-export100 1:9.9.5.dfsg-9+deb8u12
+libdns100 1:9.9.5.dfsg-9+deb8u12
-libexpat1 2.1.0-6+deb8u3
+libexpat1 2.1.0-6+deb8u4
-libffi6 3.1-2+b2
+libffi6 3.1-2+deb8u1
-libgcrypt20 1.6.3-2+deb8u2
+libgcrypt20 1.6.3-2+deb8u4
-libgnutls-deb0-28 3.3.8-6+deb8u5
-libgnutls-openssl27 3.3.8-6+deb8u5
+libgnutls-deb0-28 3.3.8-6+deb8u6
+libgnutls-openssl27 3.3.8-6+deb8u6
-libirs-export91 1:9.9.5.dfsg-9+deb8u11
-libisc-export95 1:9.9.5.dfsg-9+deb8u11
-libisc95 1:9.9.5.dfsg-9+deb8u11
-libisccc90 1:9.9.5.dfsg-9+deb8u11
-libisccfg-export90 1:9.9.5.dfsg-9+deb8u11
-libisccfg90 1:9.9.5.dfsg-9+deb8u11
+libirs-export91 1:9.9.5.dfsg-9+deb8u12
+libisc-export95 1:9.9.5.dfsg-9+deb8u12
+libisc95 1:9.9.5.dfsg-9+deb8u12
+libisccc90 1:9.9.5.dfsg-9+deb8u12
+libisccfg-export90 1:9.9.5.dfsg-9+deb8u12
+libisccfg90 1:9.9.5.dfsg-9+deb8u12
-liblwres90 1:9.9.5.dfsg-9+deb8u11
+liblwres90 1:9.9.5.dfsg-9+deb8u12
-libtiff5 4.0.3-12.3+deb8u3
+libtiff5 4.0.3-12.3+deb8u4
-linux-image-4.9.0-0.bpo.3-amd64 4.9.25-1~bpo8+1
+linux-image-4.9.0-0.bpo.3-amd64 4.9.30-2+deb9u2~bpo8+1
-locales 2.19-18+deb8u9
+locales 2.19-18+deb8u10
-multiarch-support 2.19-18+deb8u9
+multiarch-support 2.19-18+deb8u10
-python-cryptography 1.3.4-1~bpo8+2
+python-cryptography 1.7.1-3~bpo8+1
-salt-common 2016.11.5+ds-3
-salt-minion 2016.11.5+ds-3
+salt-common 2016.11.6+ds-1
+salt-minion 2016.11.6+ds-1

diff --git a/.etckeeper b/.etckeeper
index 670d21589cd68f1e6d5a2c64836d80e8c5156127..d91a00f7c61908b94acf68d588eea7ee48fd6fa5 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -246,8 +246,9 @@ maybe chmod 0755 'apt/trusted.gpg.d'
 maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-jessie-automatic.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-jessie-security-automatic.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-jessie-stable.gpg'
-maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-squeeze-automatic.gpg'
-maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-squeeze-stable.gpg'
+maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-stretch-automatic.gpg'
+maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-stretch-security-automatic.gpg'
+maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-stretch-stable.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-wheezy-automatic.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-wheezy-stable.gpg'
 maybe chmod 0755 'apticron'

diff --git a/apt/trusted.gpg.d/debian-archive-squeeze-automatic.gpg b/apt/trusted.gpg.d/debian-archive-squeeze-automatic.gpg
deleted file mode 100644 (file)
index 02fbddc..0000000
Binary files a/apt/trusted.gpg.d/debian-archive-squeeze-automatic.gpg and /dev/null differ

diff --git a/apt/trusted.gpg.d/debian-archive-squeeze-stable.gpg b/apt/trusted.gpg.d/debian-archive-squeeze-stable.gpg
deleted file mode 100644 (file)
index ca93dba..0000000
Binary files a/apt/trusted.gpg.d/debian-archive-squeeze-stable.gpg and /dev/null differ

diff --git a/apt/trusted.gpg.d/debian-archive-stretch-automatic.gpg b/apt/trusted.gpg.d/debian-archive-stretch-automatic.gpg
new file mode 100644 (file)
index 0000000..7dc19c5
Binary files /dev/null and b/apt/trusted.gpg.d/debian-archive-stretch-automatic.gpg differ

diff --git a/apt/trusted.gpg.d/debian-archive-stretch-security-automatic.gpg b/apt/trusted.gpg.d/debian-archive-stretch-security-automatic.gpg
new file mode 100644 (file)
index 0000000..79542e0
Binary files /dev/null and b/apt/trusted.gpg.d/debian-archive-stretch-security-automatic.gpg differ

diff --git a/apt/trusted.gpg.d/debian-archive-stretch-stable.gpg b/apt/trusted.gpg.d/debian-archive-stretch-stable.gpg
new file mode 100644 (file)
index 0000000..2c3f78f
Binary files /dev/null and b/apt/trusted.gpg.d/debian-archive-stretch-stable.gpg differ

diff --git a/salt/minion b/salt/minion
index bc1644f52e8b9873d06b1175cdfd59c1fcef8428..44e5f4e52f1fae71c2117975a99db58ab1002cf2 100644 (file)
--- a/salt/minion
+++ b/salt/minion
@@ -151,7 +151,11 @@
 # Set the default outputter used by the salt-call command. The default is
 # "nested".
 #output: nested
-#
+
+# To set a list of additional directories to search for salt outputters, set the
+# outputter_dirs option.
+#outputter_dirs: []
+
 # By default output is colored. To disable colored output, set the color value
 # to False.
 #color: True
@@ -231,7 +235,7 @@
 # cause sub minion process to restart.
 #auth_safemode: False
 
-# Ping Master to ensure connection is alive (minutes).
+# Ping Master to ensure connection is alive (seconds).
 #ping_interval: 0
 
 # To auto recover minions if master changes IP address (DDNS)
@@ -369,6 +373,9 @@
 #    interface: eth0
 #    cidr: '10.0.0.0/8'
 
+# The number of seconds a mine update runs.
+#mine_interval: 60
+
 # Windows platforms lack posix IPC and must rely on slower TCP based inter-
 # process communications. Set ipc_mode to 'tcp' on such systems
 #ipc_mode: ipc
@@ -578,14 +585,11 @@
 #fileserver_limit_traversal: False
 
 # The hash_type is the hash to use when discovering the hash of a file on
-# the local fileserver. The default is md5, but sha1, sha224, sha256, sha384
+# the local fileserver. The default is sha256, but md5, sha1, sha224, sha384
 # and sha512 are also supported.
 #
-# WARNING: While md5 and sha1 are also supported, do not use it due to the high chance
-# of possible collisions and thus security breach.
-#
-# WARNING: While md5 is also supported, do not use it due to the high chance
-# of possible collisions and thus security breach.
+# WARNING: While md5 and sha1 are also supported, do not use them due to the
+# high chance of possible collisions and thus security breach.
 #
 # Warning: Prior to changing this value, the minion should be stopped and all
 # Salt caches should be cleared.