committing changes in /etc after apt run

Package changes:
-gnupg 1.4.18-7+deb8u1
-gpgv 1.4.18-7+deb8u1
+gnupg 1.4.18-7+deb8u2
+gpgv 1.4.18-7+deb8u2
-libgcrypt20 1.6.3-2+deb8u1
+libgcrypt20 1.6.3-2+deb8u2
-libidn11 1.29-1+deb8u1
+libidn11 1.29-1+deb8u2
-libwireshark-data 1.12.1+g01b65bf-4+deb8u7
-libwireshark5 1.12.1+g01b65bf-4+deb8u7
-libwiretap4 1.12.1+g01b65bf-4+deb8u7
+libwireshark-data 1.12.1+g01b65bf-4+deb8u8
+libwireshark5 1.12.1+g01b65bf-4+deb8u8
+libwiretap4 1.12.1+g01b65bf-4+deb8u8
-libwsutil4 1.12.1+g01b65bf-4+deb8u7
+libwsutil4 1.12.1+g01b65bf-4+deb8u8
-linux-image-4.6.0-0.bpo.1-amd64 4.6.3-1~bpo8+1
+linux-image-4.6.0-0.bpo.1-amd64 4.6.4-1~bpo8+1
+python-systemd 231-2~bpo8+1
-salt-common 2016.3.2+ds-1
-salt-minion 2016.3.2+ds-1
+salt-common 2016.3.3+ds-1
+salt-minion 2016.3.3+ds-1
-tshark 1.12.1+g01b65bf-4+deb8u7
+tshark 1.12.1+g01b65bf-4+deb8u8
-wireshark-common 1.12.1+g01b65bf-4+deb8u7
+wireshark-common 1.12.1+g01b65bf-4+deb8u8

diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index 808f6b81c434695783fcd78b1ccbb3bec3bd227d..957b3a45143645658bde3a466cd41a8ae8e1efb5 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -1,37 +1,26 @@
 // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal
 APT::NeverAutoRemove
 {
-   "^linux-image-3\.16\.0-1-grml-amd64$";
    "^linux-image-3\.16\.0-4-amd64$";
    "^linux-image-4\.6\.0-0\.bpo\.1-amd64$";
-   "^linux-headers-3\.16\.0-1-grml-amd64$";
    "^linux-headers-3\.16\.0-4-amd64$";
    "^linux-headers-4\.6\.0-0\.bpo\.1-amd64$";
-   "^linux-image-extra-3\.16\.0-1-grml-amd64$";
    "^linux-image-extra-3\.16\.0-4-amd64$";
    "^linux-image-extra-4\.6\.0-0\.bpo\.1-amd64$";
-   "^linux-signed-image-3\.16\.0-1-grml-amd64$";
    "^linux-signed-image-3\.16\.0-4-amd64$";
    "^linux-signed-image-4\.6\.0-0\.bpo\.1-amd64$";
-   "^kfreebsd-image-3\.16\.0-1-grml-amd64$";
    "^kfreebsd-image-3\.16\.0-4-amd64$";
    "^kfreebsd-image-4\.6\.0-0\.bpo\.1-amd64$";
-   "^kfreebsd-headers-3\.16\.0-1-grml-amd64$";
    "^kfreebsd-headers-3\.16\.0-4-amd64$";
    "^kfreebsd-headers-4\.6\.0-0\.bpo\.1-amd64$";
-   "^gnumach-image-3\.16\.0-1-grml-amd64$";
    "^gnumach-image-3\.16\.0-4-amd64$";
    "^gnumach-image-4\.6\.0-0\.bpo\.1-amd64$";
-   "^.*-modules-3\.16\.0-1-grml-amd64$";
    "^.*-modules-3\.16\.0-4-amd64$";
    "^.*-modules-4\.6\.0-0\.bpo\.1-amd64$";
-   "^.*-kernel-3\.16\.0-1-grml-amd64$";
    "^.*-kernel-3\.16\.0-4-amd64$";
    "^.*-kernel-4\.6\.0-0\.bpo\.1-amd64$";
-   "^linux-backports-modules-.*-3\.16\.0-1-grml-amd64$";
    "^linux-backports-modules-.*-3\.16\.0-4-amd64$";
    "^linux-backports-modules-.*-4\.6\.0-0\.bpo\.1-amd64$";
-   "^linux-tools-3\.16\.0-1-grml-amd64$";
    "^linux-tools-3\.16\.0-4-amd64$";
    "^linux-tools-4\.6\.0-0\.bpo\.1-amd64$";
 };

diff --git a/salt/minion b/salt/minion
index 3ba8ba0095317d35a00e6fd7ae2f21f1e6054a82..7270f0c73de473142bf3532802f7d9483018478f 100644 (file)
--- a/salt/minion
+++ b/salt/minion
@@ -127,6 +127,13 @@
 # This data may contain sensitive data and should be protected accordingly.
 #cachedir: /var/cache/salt/minion
 
+# Append minion_id to these directories.  Helps with
+# multiple proxies and minions running on the same machine.
+# Allowed elements in the list: pki_dir, cachedir, extension_modules
+# Normally not needed unless running several proxies and/or minions on the same machine
+# Defaults to ['cachedir'] for proxies, [] (empty list) for regular minions
+#append_minionid_config_dirs:
+
 # Verify and set permissions on configuration directories at startup.
 #verify_env: True
 

diff --git a/salt/proxy b/salt/proxy
index 7b835e25ea52ef405500e7c81584f18b06ac0858..4e5cc3452cda59e28cd6e2b63bcad6081fcaba20 100644 (file)
--- a/salt/proxy
+++ b/salt/proxy
@@ -84,6 +84,16 @@
 # This data may contain sensitive data and should be protected accordingly.
 #cachedir: /var/cache/salt/minion
 
+# Append minion_id to these directories.  Helps with
+# multiple proxies and minions running on the same machine.
+# Allowed elements in the list: pki_dir, cachedir, extension_modules
+# Normally not needed unless running several proxies and/or minions on the same machine
+# Defaults to ['cachedir'] for proxies, [] (empty list) for regular minions
+# append_minionid_config_dirs:
+#   - cachedir
+
+
+
 # Verify and set permissions on configuration directories at startup.
 #verify_env: True