From 106cbbc3c83962c9cc9c8f7e0e7aafa9bfa57c03 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Sun, 31 Oct 2021 09:58:27 +0100 Subject: [PATCH] committing changes in /etc made by "apt dist-upgrade -y" Packages with configuration changes: -salt-master 3003.2+ds-1 all -salt-minion 3003.2+ds-1 all +salt-master 3004+ds-1 all +salt-minion 3004+ds-1 all Package changes: -salt-common 3003.2+ds-1 all -salt-master 3003.2+ds-1 all -salt-minion 3003.2+ds-1 all -salt-ssh 3003.2+ds-1 all +salt-common 3004+ds-1 all +salt-master 3004+ds-1 all +salt-minion 3004+ds-1 all +salt-ssh 3004+ds-1 all --- salt/master | 6 +++--- salt/minion | 4 ++-- salt/proxy | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/salt/master b/salt/master index fa70219..07bf2e9 100644 --- a/salt/master +++ b/salt/master @@ -306,7 +306,7 @@ ########################################## # Enable passphrase protection of Master private key. Although a string value # is acceptable; passwords should be stored in an external vaulting mechanism -# and retrieved via sdb. See https://docs.saltstack.com/en/latest/topics/sdb/. +# and retrieved via sdb. See https://docs.saltproject.io/en/latest/topics/sdb/. # Passphrase protection is off by default but an example of an sdb profile and # query is as follows. # masterkeyring: @@ -1001,7 +1001,7 @@ # configuration options to fully understand the tunable parameters and their implications. # # Note: setting ``pillar_cache: True`` has no effect on targeting Minions with Pillars. -# See https://docs.saltstack.com/en/latest/topics/targeting/pillar.html +# See https://docs.saltproject.io/en/latest/topics/targeting/pillar.html #pillar_cache: False # If and only if a master has set ``pillar_cache: True``, the cache TTL controls the amount @@ -1049,7 +1049,7 @@ ###### Reactor Settings ##### ########################################### -# Define a salt reactor. See https://docs.saltstack.com/en/latest/topics/reactor/ +# Define a salt reactor. See https://docs.saltproject.io/en/latest/topics/reactor/ #reactor: [] #Set the TTL for the cache of the reactor configuration. diff --git a/salt/minion b/salt/minion index b87397e..f4d2622 100644 --- a/salt/minion +++ b/salt/minion @@ -509,7 +509,7 @@ # templating on the SLS file, and then load the result as YAML. This syntax is # documented in further depth at the following URL: # -# https://docs.saltstack.com/en/latest/ref/renderers/#composing-renderers +# https://docs.saltproject.io/en/latest/ref/renderers/#composing-renderers # # NOTE: The "shebang" prefix (e.g. "#!jinja|yaml") described in the # documentation linked above is for use in an SLS file to override the default @@ -732,7 +732,7 @@ ###### Reactor Settings ##### ########################################### -# Define a salt reactor. See https://docs.saltstack.com/en/latest/topics/reactor/ +# Define a salt reactor. See https://docs.saltproject.io/en/latest/topics/reactor/ #reactor: [] #Set the TTL for the cache of the reactor configuration. diff --git a/salt/proxy b/salt/proxy index 757941e..c0eec84 100644 --- a/salt/proxy +++ b/salt/proxy @@ -7,10 +7,10 @@ # not be set in the config. If there is no blank line after the comment, the # value is presented as an example and is not the default. -# Per default the minion will automatically include all config files -# from minion.d/*.conf (minion.d is a directory in the same directory +# Per default the proxy minion will automatically include all config files +# from proxy.d/*.conf (proxy.d is a directory in the same directory # as the main minion config file). -#default_include: minion.d/*.conf +#default_include: proxy.d/*.conf # Backwards compatibility option for proxymodules created before 2015.8.2 # This setting will default to 'False' in the 2016.3.0 release @@ -361,7 +361,7 @@ # templating on the SLS file, and then load the result as YAML. This syntax is # documented in further depth at the following URL: # -# https://docs.saltstack.com/en/latest/ref/renderers/#composing-renderers +# https://docs.saltproject.io/en/latest/ref/renderers/#composing-renderers # # NOTE: The "shebang" prefix (e.g. "#!jinja|yaml") described in the # documentation linked above is for use in an SLS file to override the default -- 2.39.5