saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #185 from babilen/dev-trailing-whitespace

Browse Source 
Remove trailing whitespace from master config
This commit is contained in:
puneet kandhari 2015-10-13 09:09:51 -07:00
commit 52803ea883
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/files/master.d/f_defaults.conf
View File

@ -135,7 +135,7 @@
{{ get_config('minion_data_cache', 'True') }} {{ get_config('minion_data_cache', 'True') }}
# Store all returns in the given returner. # Store all returns in the given returner.
# Setting this option requires that any returner-specific configuration also # Setting this option requires that any returner-specific configuration also
# be set. See various returners in salt/returners for details on required # be set. See various returners in salt/returners for details on required
# configuration values. (See also, event_return_queue below.) # configuration values. (See also, event_return_queue below.)
# #
@ -199,12 +199,12 @@ event_return_blacklist:
# the key rotation event as minions reconnect. Consider this carefully if this # the key rotation event as minions reconnect. Consider this carefully if this
# salt master is managing a large number of minions. # salt master is managing a large number of minions.
# #
# If disabled, it is recommended to handle this event by listening for the # If disabled, it is recommended to handle this event by listening for the
# 'aes_key_rotate' event with the 'key' tag and acting appropriately. # 'aes_key_rotate' event with the 'key' tag and acting appropriately.
{{ get_config('ping_on_rotate', 'False') }} {{ get_config('ping_on_rotate', 'False') }}
# By default, the master deletes its cache of minion data when the key for that # By default, the master deletes its cache of minion data when the key for that
# minion is removed. To preserve the cache after key deletion, set # minion is removed. To preserve the cache after key deletion, set
# 'preserve_minion_cache' to True. # 'preserve_minion_cache' to True.
# #
# WARNING: This may have security implications if compromised minions auth with # WARNING: This may have security implications if compromised minions auth with
@ -336,7 +336,7 @@ client_acl_blacklist:
{% endif %} {% endif %}
# Enforce client_acl & client_acl_blacklist when users have sudo # Enforce client_acl & client_acl_blacklist when users have sudo
# access to the salt command. # access to the salt command.
# #
{{ get_config('sudo_acl', 'False') }} {{ get_config('sudo_acl', 'False') }}
@ -492,7 +492,7 @@ client_acl_blacklist:
# the master server. The default is md5, but sha1, sha224, sha256, sha384 # the master server. The default is md5, but sha1, sha224, sha256, sha384
# and sha512 are also supported. # and sha512 are also supported.
# #
# Prior to changing this value, the master should be stopped and all Salt # Prior to changing this value, the master should be stopped and all Salt
# caches should be cleared. # caches should be cleared.
{{ get_config('hash_type', 'md5') }} {{ get_config('hash_type', 'md5') }}