committing changes in /etc after apt run

Package changes:
-apache2 2.4.25-3+deb9u1 amd64
-apache2-bin 2.4.25-3+deb9u1 amd64
-apache2-data 2.4.25-3+deb9u1 all
-apache2-utils 2.4.25-3+deb9u1 amd64
+apache2 2.4.25-3+deb9u2 amd64
+apache2-bin 2.4.25-3+deb9u2 amd64
+apache2-data 2.4.25-3+deb9u2 all
+apache2-utils 2.4.25-3+deb9u2 amd64
-salt-common 2016.11.6+ds-1 all
-salt-minion 2016.11.6+ds-1 all
+salt-common 2017.7.0+ds-1 all
+salt-minion 2017.7.0+ds-1 all

diff --git a/salt/minion b/salt/minion
index 44e5f4e52f1fae71c2117975a99db58ab1002cf2..b1122c9e5227f6408ec48aeb8319bb7e0465c0ca 100644 (file)
--- a/salt/minion
+++ b/salt/minion
@@ -165,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:
@@ -500,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'.

diff --git a/salt/proxy b/salt/proxy
index bfd43588492db8222af65823fedd84dc83437c7d..f81dc32b5c7ba7be7da3f2d9acb4590450db5a4a 100644 (file)
--- 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: