valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up master config template a little

Browse Source 
I got rid of the cluster stuff, since it does not work and needs
to be pulled out of the core anyway
This commit is contained in:
Thomas S Hatch 2012-09-24 11:43:33 -06:00
parent f0145f74ea
commit b80b7cc395
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
conf/master.template
View File

@ -9,14 +9,16 @@
# The address of the interface to bind to # The address of the interface to bind to
#interface: 0.0.0.0 #interface: 0.0.0.0
# The port used by the publisher # The tcp port used by the publisher
#publish_port: 4505 #publish_port: 4505
# Recover minion connections when they are lost. associated with subscribers # Refresh the publisher connections when sending out commands, this is a fix
# running on Xen and VMware virtual machines. Default: True # for zeromq losing some minion connections. Default: True
#pub_refresh: True #pub_refresh: True
# The user to run salt # The user to run the salt-master as. Salt will update all permissions to
# allow the specified user to run the master. If the modified files cause
# conflicts set verify_env to False.
#user: root #user: root
# Max open files # Max open files
@ -30,9 +32,9 @@
# max open files. # max open files.
# #
# If you wish to set a different value than the default one, uncomment and # If you wish to set a different value than the default one, uncomment and
# configure this setting. Remember that this value CANNOT be higher that the # configure this setting. Remember that this value CANNOT be higher than the
# hard limit. Raising the hard limit depends on your OS and/or distribution, # hard limit. Raising the hard limit depends on your OS and/or distribution,
# so go to your preferred search engine and search for(for example): # a good way to find the limit is to search the internet for(for example):
# raise max open files hard limit debian # raise max open files hard limit debian
# #
#max_open_files: 100000 #max_open_files: 100000
@ -42,7 +44,8 @@
# running slowly, increase the number of threads # running slowly, increase the number of threads
#worker_threads: 5 #worker_threads: 5
# The port used by the communication interface # The port used by the communication interface. The ret (return) port is the
# interface used for the file server, authentication, job returnes, etc.
#ret_port: 4506 #ret_port: 4506
# Specify the location of the daemon process ID file # Specify the location of the daemon process ID file
@ -61,7 +64,7 @@
# Verify and set permissions on configuration directories at startup # Verify and set permissions on configuration directories at startup
#verify_env: True #verify_env: True
# Set the number of hours to keep old job information # Set the number of hours to keep old job information in the job cache
#keep_jobs: 24 #keep_jobs: 24
# Set the default timeout for the salt command and api, the default is 5 # Set the default timeout for the salt command and api, the default is 5
@ -297,25 +300,6 @@
# - manage.up # - manage.up
# #
##### Cluster settings #####
##########################################
# Salt supports automatic clustering, salt creates a single ip address which
# is shared among the individual salt components using ucarp. The private key
# and all of the minion keys are maintained across the defined cluster masters.
# The failover service is automatically managed via these settings
# List the identifiers for the other cluster masters in this manner:
# [saltmaster-01.foo.com,saltmaster-02.foo.com,saltmaster-03.foo.com]
# The members of this master array must be running as salt minions to
# facilitate the distribution of cluster information
#cluster_masters: []
# The cluster modes are "paranoid" and "full"
# paranoid will only distribute the accepted minion public keys.
# full will also distribute the master private key.
#cluster_mode: paranoid
##### Logging settings ##### ##### Logging settings #####
########################################## ##########################################
# The location of the master log file # The location of the master log file