From: Frank Brehm Date: Wed, 19 Jul 2017 07:09:06 +0000 (+0200) Subject: committing changes in /etc after apt run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=372db6f236f3f2fb738f4636294403a60272e7ee;p=config%2Fsarah%2Fetc.git committing changes in /etc after apt run Package changes: -bind9-host 1:9.9.5.dfsg-9+deb8u11 +bind9-host 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 -nginx-common 1.6.2-5+deb8u4 -nginx-full 1.6.2-5+deb8u4 +nginx-common 1.6.2-5+deb8u5 +nginx-full 1.6.2-5+deb8u5 +python-psutil 2.1.1-1+b1 -salt-common 2016.11.5+ds-3 -salt-minion 2016.11.5+ds-3 +salt-common 2017.7.0+ds-1 +salt-minion 2017.7.0+ds-1 --- diff --git a/.etckeeper b/.etckeeper index b7dd8ff..1587160 100755 --- a/.etckeeper +++ b/.etckeeper @@ -116,8 +116,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 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 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 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 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 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 bc1644f..b1122c9 100644 --- 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 @@ -161,7 +165,7 @@ # strip_colors: False # Backup files that are replaced by file.managed and file.recurse under -# 'cachedir'/file_backups relative to their original location and appended +# 'cachedir'/file_backup relative to their original location and appended # with a timestamp. The only valid setting is "minion". Disabled by default. # # Alternatively this can be specified for each file in state files: @@ -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 @@ -493,6 +500,11 @@ # as the environment setting, but for pillar instead of states. #pillarenv: None # +# Set this option to True to force the pillarenv to be the same as the +# effective saltenv when running states. Note that if pillarenv is specified, +# this option will be ignored. +#pillarenv_from_saltenv: False +# # Set this option to 'True' to force a 'KeyError' to be raised whenever an # attempt to retrieve a named value from pillar fails. When this option is set # to 'False', the failed attempt returns an empty string. Default is 'False'. @@ -578,14 +590,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. diff --git a/salt/proxy b/salt/proxy index bfd4358..f81dc32 100644 --- a/salt/proxy +++ b/salt/proxy @@ -28,8 +28,28 @@ # dictionary. Otherwise it is assumed that the module calls the grains # function in a custom way and returns the data elsewhere # -# Default to False for 2016.3 and 2016.11. Switch to True for Nitrogen. -# proxy_merge_grains_in_module: False +# Default to False for 2016.3 and 2016.11. Switch to True for 2017.7.0. +# proxy_merge_grains_in_module: True + +# If a proxymodule has a function called 'alive' returning a boolean +# flag reflecting the state of the connection with the remove device, +# when this option is set as True, a scheduled job on the proxy will +# try restarting the connection. The polling frequency depends on the +# next option, 'proxy_keep_alive_interval'. Added in 2017.7.0. +# proxy_keep_alive: True + +# The polling interval (in minutes) to check if the underlying connection +# with the remote device is still alive. This option requires +# 'proxy_keep_alive' to be configured as True and the proxymodule to +# implement the 'alive' function. Added in 2017.7.0. +# proxy_keep_alive_interval: 1 + +# By default, any proxy opens the connection with the remote device when +# initialized. Some proxymodules allow through this option to open/close +# the session per command. This requires the proxymodule to have this +# capability. Please consult the documentation to see if the proxy type +# used can be that flexible. Added in 2017.7.0. +# proxy_always_alive: True # If multiple masters are specified in the 'master' setting, the default behavior # is to always try to connect to them in the order they are listed. If random_master is @@ -119,7 +139,7 @@ # strip_colors: False # Backup files that are replaced by file.managed and file.recurse under -# 'cachedir'/file_backups relative to their original location and appended +# 'cachedir'/file_backup relative to their original location and appended # with a timestamp. The only valid setting is "minion". Disabled by default. # # Alternatively this can be specified for each file in state files: