From: Frank Brehm Date: Tue, 6 Jun 2017 21:38:04 +0000 (+0200) Subject: committing changes in /etc after apt run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=754cd5f8b7b9dc0beb6e6ac6b50f7ba2de100691;p=config%2Fns1%2Fetc.git committing changes in /etc after apt run Package changes: -libldap-2.4-2 2.4.40+dfsg-1+deb8u2 +libldap-2.4-2 2.4.40+dfsg-1+deb8u3 -libtasn1-6 4.2-3+deb8u2 +libtasn1-6 4.2-3+deb8u3 -linux-image-amd64 4.9+79~bpo8+1 +linux-image-4.9.0-0.bpo.3-amd64 4.9.25-1~bpo8+1 +linux-image-amd64 4.9+80~bpo8+1 -perl 5.20.2-3+deb8u6 -perl-base 5.20.2-3+deb8u6 -perl-modules 5.20.2-3+deb8u6 +perl 5.20.2-3+deb8u7 +perl-base 5.20.2-3+deb8u7 +perl-modules 5.20.2-3+deb8u7 -python-cffi-backend 1.4.2-2~bpo8+1 +python-cffi-backend 1.9.1-2~bpo8+1 -salt-common 2016.11.4+ds-1 -salt-minion 2016.11.4+ds-1 +salt-common 2016.11.5+ds-3 +salt-minion 2016.11.5+ds-3 -sudo 1.8.10p3-1+deb8u3 +sudo 1.8.10p3-1+deb8u4 --- diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index 003b419..7afb97f 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\.9\.0-0\.bpo\.1-amd64$"; "^linux-image-4\.9\.0-0\.bpo\.2-amd64$"; - "^linux-headers-4\.9\.0-0\.bpo\.1-amd64$"; + "^linux-image-4\.9\.0-0\.bpo\.3-amd64$"; "^linux-headers-4\.9\.0-0\.bpo\.2-amd64$"; - "^linux-image-extra-4\.9\.0-0\.bpo\.1-amd64$"; + "^linux-headers-4\.9\.0-0\.bpo\.3-amd64$"; "^linux-image-extra-4\.9\.0-0\.bpo\.2-amd64$"; - "^linux-signed-image-4\.9\.0-0\.bpo\.1-amd64$"; + "^linux-image-extra-4\.9\.0-0\.bpo\.3-amd64$"; "^linux-signed-image-4\.9\.0-0\.bpo\.2-amd64$"; - "^kfreebsd-image-4\.9\.0-0\.bpo\.1-amd64$"; + "^linux-signed-image-4\.9\.0-0\.bpo\.3-amd64$"; "^kfreebsd-image-4\.9\.0-0\.bpo\.2-amd64$"; - "^kfreebsd-headers-4\.9\.0-0\.bpo\.1-amd64$"; + "^kfreebsd-image-4\.9\.0-0\.bpo\.3-amd64$"; "^kfreebsd-headers-4\.9\.0-0\.bpo\.2-amd64$"; - "^gnumach-image-4\.9\.0-0\.bpo\.1-amd64$"; + "^kfreebsd-headers-4\.9\.0-0\.bpo\.3-amd64$"; "^gnumach-image-4\.9\.0-0\.bpo\.2-amd64$"; - "^.*-modules-4\.9\.0-0\.bpo\.1-amd64$"; + "^gnumach-image-4\.9\.0-0\.bpo\.3-amd64$"; "^.*-modules-4\.9\.0-0\.bpo\.2-amd64$"; - "^.*-kernel-4\.9\.0-0\.bpo\.1-amd64$"; + "^.*-modules-4\.9\.0-0\.bpo\.3-amd64$"; "^.*-kernel-4\.9\.0-0\.bpo\.2-amd64$"; - "^linux-backports-modules-.*-4\.9\.0-0\.bpo\.1-amd64$"; + "^.*-kernel-4\.9\.0-0\.bpo\.3-amd64$"; "^linux-backports-modules-.*-4\.9\.0-0\.bpo\.2-amd64$"; - "^linux-tools-4\.9\.0-0\.bpo\.1-amd64$"; + "^linux-backports-modules-.*-4\.9\.0-0\.bpo\.3-amd64$"; "^linux-tools-4\.9\.0-0\.bpo\.2-amd64$"; + "^linux-tools-4\.9\.0-0\.bpo\.3-amd64$"; }; diff --git a/salt/minion b/salt/minion index 1dcc065..bc1644f 100644 --- a/salt/minion +++ b/salt/minion @@ -193,6 +193,15 @@ # The wait-time will be a random number of seconds between 0 and the defined value. #random_reauth_delay: 60 + +# To avoid overloading a master when many minions startup at once, a randomized +# delay may be set to tell the minions to wait before connecting to the master. +# This value is the number of seconds to choose from for a random number. For +# example, setting this value to 60 will choose a random number of seconds to delay +# on startup between zero seconds and sixty seconds. Setting to '0' will disable +# this feature. +#random_startup_delay: 0 + # When waiting for a master to accept the minion's public key, salt will # continuously attempt to reconnect until successful. This is the timeout value, # in seconds, for each individual attempt. After this timeout expires, the minion