From faad356441716854a2a8005485ec857742beccf5 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 6 Feb 2017 11:51:10 +0100 Subject: [PATCH] committing changes in /etc after apt run Package changes: -libgd3 2.1.0-5+deb8u8 +libgd3 2.1.0-5+deb8u9 -libssl1.0.0 1.0.1t-1+deb8u5 +libssl1.0.0 1.0.1t-1+deb8u6 -libxpm4 1:3.5.11-1+b1 +libxpm4 1:3.5.12-0+deb8u1 -linux-image-amd64 4.8+77~bpo8+1 +linux-image-4.9.0-0.bpo.1-amd64 4.9.2-2~bpo8+1 +linux-image-amd64 4.9+78~bpo8+1 -openssl 1.0.1t-1+deb8u5 +openssl 1.0.1t-1+deb8u6 -python-jinja2 2.7.3-1 +python-jinja2 2.9.4-1 -salt-common 2016.11.1+ds-1 -salt-minion 2016.11.1+ds-1 +salt-common 2016.11.2+ds-1 +salt-minion 2016.11.2+ds-1 -tcpdump 4.6.2-5+deb8u1 +tcpdump 4.9.0-1~deb8u1 --- apt/apt.conf.d/01autoremove-kernels | 22 +++++++++++----------- salt/minion | 10 +++++++++- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index 1f383f9..141a65c 100644 --- a/apt/apt.conf.d/01autoremove-kernels +++ b/apt/apt.conf.d/01autoremove-kernels @@ -1,26 +1,26 @@ // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal APT::NeverAutoRemove { - "^linux-image-4\.7\.0-0\.bpo\.1-amd64$"; "^linux-image-4\.8\.0-0\.bpo\.2-amd64$"; - "^linux-headers-4\.7\.0-0\.bpo\.1-amd64$"; + "^linux-image-4\.9\.0-0\.bpo\.1-amd64$"; "^linux-headers-4\.8\.0-0\.bpo\.2-amd64$"; - "^linux-image-extra-4\.7\.0-0\.bpo\.1-amd64$"; + "^linux-headers-4\.9\.0-0\.bpo\.1-amd64$"; "^linux-image-extra-4\.8\.0-0\.bpo\.2-amd64$"; - "^linux-signed-image-4\.7\.0-0\.bpo\.1-amd64$"; + "^linux-image-extra-4\.9\.0-0\.bpo\.1-amd64$"; "^linux-signed-image-4\.8\.0-0\.bpo\.2-amd64$"; - "^kfreebsd-image-4\.7\.0-0\.bpo\.1-amd64$"; + "^linux-signed-image-4\.9\.0-0\.bpo\.1-amd64$"; "^kfreebsd-image-4\.8\.0-0\.bpo\.2-amd64$"; - "^kfreebsd-headers-4\.7\.0-0\.bpo\.1-amd64$"; + "^kfreebsd-image-4\.9\.0-0\.bpo\.1-amd64$"; "^kfreebsd-headers-4\.8\.0-0\.bpo\.2-amd64$"; - "^gnumach-image-4\.7\.0-0\.bpo\.1-amd64$"; + "^kfreebsd-headers-4\.9\.0-0\.bpo\.1-amd64$"; "^gnumach-image-4\.8\.0-0\.bpo\.2-amd64$"; - "^.*-modules-4\.7\.0-0\.bpo\.1-amd64$"; + "^gnumach-image-4\.9\.0-0\.bpo\.1-amd64$"; "^.*-modules-4\.8\.0-0\.bpo\.2-amd64$"; - "^.*-kernel-4\.7\.0-0\.bpo\.1-amd64$"; + "^.*-modules-4\.9\.0-0\.bpo\.1-amd64$"; "^.*-kernel-4\.8\.0-0\.bpo\.2-amd64$"; - "^linux-backports-modules-.*-4\.7\.0-0\.bpo\.1-amd64$"; + "^.*-kernel-4\.9\.0-0\.bpo\.1-amd64$"; "^linux-backports-modules-.*-4\.8\.0-0\.bpo\.2-amd64$"; - "^linux-tools-4\.7\.0-0\.bpo\.1-amd64$"; + "^linux-backports-modules-.*-4\.9\.0-0\.bpo\.1-amd64$"; "^linux-tools-4\.8\.0-0\.bpo\.2-amd64$"; + "^linux-tools-4\.9\.0-0\.bpo\.1-amd64$"; }; diff --git a/salt/minion b/salt/minion index 35b48a7..419bcc8 100644 --- a/salt/minion +++ b/salt/minion @@ -801,8 +801,16 @@ ###### Returner settings ###### ############################################ -# Which returner(s) will be used for minion's result: +# Default Minion returners. Can be a comma delimited string or a list: +# #return: mysql +# +#return: mysql,slack,redis +# +#return: +# - mysql +# - hipchat +# - slack ###### Miscellaneous settings ###### -- 2.39.5