valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3684 from ydavid365/patch-7

Browse Source 
updated formatting for consistency. typos fixed.
This commit is contained in:
Thomas S Hatch 2013-02-11 20:18:17 -08:00
commit 3ce05e16e8
1 changed files with 55 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
conf/master
View File

@ -4,8 +4,8 @@
# Values that are commented out but have no space after the comment are # Values that are commented out but have no space after the comment are
# defaults that need not be set in the config. If there is a space after the # defaults that need not be set in the config. If there is a space after the
# comment that the value is presented as an example and is not the default. # comment that the value is presented as an example and is not the default.
#
# Per default the master will automatically include all config files # Per default, the master will automatically include all config files
# from master.d/*.conf (master.d is a directory in the same directory # from master.d/*.conf (master.d is a directory in the same directory
# as the main master config file) # as the main master config file)
#default_include: master.d/*.conf #default_include: master.d/*.conf
@ -133,11 +133,10 @@
# master or minion as root, but have a non-root group be given access to # master or minion as root, but have a non-root group be given access to
# your pki_dir. To make the access explicit, root must belong to the group # your pki_dir. To make the access explicit, root must belong to the group
# you've given access to. This is potentially quite insecure. # you've given access to. This is potentially quite insecure.
# # If an autosign_file is specified, enabling permissive_pki_access will allow group access
# If an autosign_file is specified permissive access will allow group access
# to that specific file. # to that specific file.
#permissive_pki_access: False #permissive_pki_access: False
#
# Allow users on the master access to execute specific commands on minions. # Allow users on the master access to execute specific commands on minions.
# This setting should be treated with care since it opens up execution # This setting should be treated with care since it opens up execution
# capabilities to non root users. By default this capability is completely # capabilities to non root users. By default this capability is completely
@ -163,7 +162,6 @@
# modules: # modules:
# - cmd # - cmd
# The external auth system uses the Salt auth modules to authenticate and # The external auth system uses the Salt auth modules to authenticate and
# validate users to access areas of the Salt system # validate users to access areas of the Salt system
# #
@ -175,16 +173,17 @@
# Time (in seconds) for a newly generated token to live. Default: 12 hours # Time (in seconds) for a newly generated token to live. Default: 12 hours
# token_expire: 43200 # token_expire: 43200
##### Master Module Management ##### ##### Master Module Management #####
########################################## ##########################################
# Manage how master side modules are loaded # Manage how master side modules are loaded
#
# Add any additional locations to look for master runners # Add any additional locations to look for master runners
#runner_dirs: [] #runner_dirs: []
#
# Enable Cython for master side modules # Enable Cython for master side modules
#cython_enable: False #cython_enable: False
#
##### State System settings ##### ##### State System settings #####
########################################## ##########################################
@ -192,42 +191,42 @@
# use and what modules to use. The state_top file is defined relative to the # use and what modules to use. The state_top file is defined relative to the
# root of the base environment as defined in "File Server settings" below. # root of the base environment as defined in "File Server settings" below.
#state_top: top.sls #state_top: top.sls
#
# The master_tops option replaces the external_nodes option by creating # The master_tops option replaces the external_nodes option by creating
# a plugable system for the generation of external top data. The external_nodes # a plugable system for the generation of external top data. The external_nodes
# option is deprecated by the master_tops option. # option is deprecated by the master_tops option.
# To gain the capabilities of the classic external_nodes system use the # To gain the capabilities of the classic external_nodes system, use the
# following configuration # following configuration:
#
# master_tops: # master_tops:
# ext_nodes: <Shell command which returns yaml> # ext_nodes: <Shell command which returns yaml>
# #
#master_tops: {} #master_tops: {}
#
# The external_nodes option allows Salt to gather data that would normally be # The external_nodes option allows Salt to gather data that would normally be
# placed in a top file. The external_nodes option is the executable that will # placed in a top file. The external_nodes option is the executable that will
# return the ENC data. Remember that Salt will look for external nodes AND top # return the ENC data. Remember that Salt will look for external nodes AND top
# files and combine the results if both are enabled! # files and combine the results if both are enabled!
#external_nodes: None #external_nodes: None
#
# The renderer to use on the minions to render the state data # The renderer to use on the minions to render the state data
#renderer: yaml_jinja #renderer: yaml_jinja
#
# The failhard option tells the minions to stop immediately after the first # The failhard option tells the minions to stop immediately after the first
# failure detected in the state execution, defaults to False # failure detected in the state execution, defaults to False
#failhard: False #failhard: False
#
# The state_verbose and state_output settings can be used to change the way # The state_verbose and state_output settings can be used to change the way
# state system data is printed to the display. By default all data is printed. # state system data is printed to the display. By default all data is printed.
# The state_verbose setting can be set to True or False, when set to False # The state_verbose setting can be set to True or False, when set to False
# all data that has a result of True and no changes will be suppressed. # all data that has a result of True and no changes will be suppressed.
#state_verbose: True #state_verbose: True
#
# The state_output setting changes if the output is the full multi line # The state_output setting changes if the output is the full multi line
# output for each changed state if set to 'full', but if set to 'terse' # output for each changed state if set to 'full', but if set to 'terse'
# the output will be shortened to a single line. # the output will be shortened to a single line.
#state_output: full #state_output: full
##### File Server settings ##### ##### File Server settings #####
########################################## ##########################################
# Salt runs a lightweight file server written in zeromq to deliver files to # Salt runs a lightweight file server written in zeromq to deliver files to
@ -248,8 +247,7 @@
# prod: # prod:
# - /srv/salt/prod/services # - /srv/salt/prod/services
# - /srv/salt/prod/states # - /srv/salt/prod/states
#
# Default:
#file_roots: #file_roots:
# base: # base:
# - /srv/salt # - /srv/salt
@ -285,18 +283,15 @@
# the salt master to link directly to third party systems to gather and # the salt master to link directly to third party systems to gather and
# manage the files available to minions. Multiple backends can be # manage the files available to minions. Multiple backends can be
# configured and will be searched for the requested file in the order in which # configured and will be searched for the requested file in the order in which
# they are defined here. The defult setting only enables the standard backend # they are defined here. The default setting only enables the standard backend
# "roots" which uses the "file_roots" option. # "roots" which uses the "file_roots" option.
# To enable the git backend change the option to look like this:
#fileserver_backend: #fileserver_backend:
# - git # - roots
# To use multiple backends list them in the order they are searched: # To use multiple backends list them in the order they are searched:
# fileserver_backend: # fileserver_backend:
# - git # - git
# - roots # - roots
#fileserver_backend:
# - roots
#
# Git fileserver backend configuration # Git fileserver backend configuration
# When using the git fileserver backend at least one git remote needs to be # When using the git fileserver backend at least one git remote needs to be
# defined. The user running the salt master will need read access to the repo. # defined. The user running the salt master will need read access to the repo.
@ -308,27 +303,29 @@
# When using the git backend branches and tags are translated into salt # When using the git backend branches and tags are translated into salt
# environments. # environments.
# Pillar Configurations:
# The Salt Pillar, is a system that allows for the building of global data ##### Pillar settings #####
# that is refined based on minion. Basically, the pillar creates data that ##########################################
# can be generated to be specific based on the grains of the minion. Pillar # Salt Pillars allow for the building of global data that can be made selectively
# is laid out in the same fashion as the file server, with environments, a top # available to different minions based on minion grain filtering. The Salt
# file and sls files. The difference is that the data does not need to be # Pillar is laid out in the same fashion as the file server, with environments,
# in the highstate format, and is generally just key/value pairs. # a top file and sls files. However, pillar data does not need to be in the
# # highstate format, and is generally just key/value pairs.
#pillar_roots: #pillar_roots:
# base: # base:
# - /srv/pillar # - /srv/pillar
#
# ext_pillar: # ext_pillar:
# - hiera: /etc/hiera.yaml # - hiera: /etc/hiera.yaml
# - cmd_yaml: cat /etc/salt/yaml # - cmd_yaml: cat /etc/salt/yaml
#
# The pillar_opts option adds the master configuration file data to a dict in # The pillar_opts option adds the master configuration file data to a dict in
# the pillar called "master". This is used to set simple configurations in the # the pillar called "master". This is used to set simple configurations in the
# master config file that can then be used on minions. # master config file that can then be used on minions.
#pillar_opts: True #pillar_opts: True
##### Syndic settings ##### ##### Syndic settings #####
########################################## ##########################################
# The Salt syndic is used to pass commands through a master from a higher # The Salt syndic is used to pass commands through a master from a higher
@ -337,22 +334,23 @@
# is a master that will be running a syndic daemon for passthrough the # is a master that will be running a syndic daemon for passthrough the
# "syndic_master" setting needs to be set to the location of the master server # "syndic_master" setting needs to be set to the location of the master server
# to receive commands from. # to receive commands from.
#
# Set the order_masters setting to True if this master will command lower # Set the order_masters setting to True if this master will command lower
# masters' syndic interfaces. # masters' syndic interfaces.
#order_masters: False #order_masters: False
#
# If this master will be running a salt syndic daemon, syndic_master tells # If this master will be running a salt syndic daemon, syndic_master tells
# this master where to receive commands from. # this master where to receive commands from.
#syndic_master: masterofmaster #syndic_master: masterofmaster
##### Peer Publish settings ##### ##### Peer Publish settings #####
########################################## ##########################################
# Salt minions can send commands to other minions, but only if the minion is # Salt minions can send commands to other minions, but only if the minion is
# allowed to. By default "Peer Publication" is disabled, and when enabled it # allowed to. By default "Peer Publication" is disabled, and when enabled it
# is enabled for specific minions and specific commands. This allows secure # is enabled for specific minions and specific commands. This allows secure
# compartmentalization of commands based on individual minions. # compartmentalization of commands based on individual minions.
#
# The configuration uses regular expressions to match minions and then a list # The configuration uses regular expressions to match minions and then a list
# of regular expressions to match functions. The following will allow the # of regular expressions to match functions. The following will allow the
# minion authenticated as foo.example.com to execute functions from the test # minion authenticated as foo.example.com to execute functions from the test
@ -368,7 +366,7 @@
# - .* # - .*
# This is not recommended, since it would allow anyone who gets root on any # This is not recommended, since it would allow anyone who gets root on any
# single minion to instantly have root on all of the minions! # single minion to instantly have root on all of the minions!
#
# Minions can also be allowed to execute runners from the salt master. # Minions can also be allowed to execute runners from the salt master.
# Since executing a runner from the minion could be considered a security risk, # Since executing a runner from the minion could be considered a security risk,
# it needs to be enabled. This setting functions just like the peer setting # it needs to be enabled. This setting functions just like the peer setting
@ -386,7 +384,7 @@
# peer_run: # peer_run:
# foo.example.com: # foo.example.com:
# - manage.up # - manage.up
#
##### Logging settings ##### ##### Logging settings #####
########################################## ##########################################
@ -398,30 +396,28 @@
# log_file: /var/log/salt/master # log_file: /var/log/salt/master
# log_file: file:///dev/log # log_file: file:///dev/log
# log_file: udp://loghost:10514 # log_file: udp://loghost:10514
#
#log_file: /var/log/salt/master #log_file: /var/log/salt/master
#key_logfile: /var/log/salt/key #key_logfile: /var/log/salt/key
#
# The level of messages to send to the console. # The level of messages to send to the console.
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'. # One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
# Default: 'warning'
#log_level: warning #log_level: warning
#
# The level of messages to send to the log file. # The level of messages to send to the log file.
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'. # One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
# Default: 'warning' #log_level_logfile: warning
#log_level_logfile:
# The date and time format used in log messages. Allowed date/time formating # The date and time format used in log messages. Allowed date/time formating
# can be seen here: http://docs.python.org/library/time.html#time.strftime # can be seen here: http://docs.python.org/library/time.html#time.strftime
#log_datefmt: '%H:%M:%S' #log_datefmt: '%H:%M:%S'
#log_datefmt_logfile: '%Y-%m-%d %H:%M:%S' #log_datefmt_logfile: '%Y-%m-%d %H:%M:%S'
#
# The format of the console logging messages. Allowed formatting options can # The format of the console logging messages. Allowed formatting options can
# be seen here http://docs.python.org/library/logging.html#logrecord-attributes # be seen here http://docs.python.org/library/logging.html#logrecord-attributes
#log_fmt_console: '[%(levelname)-8s] %(message)s' #log_fmt_console: '[%(levelname)-8s] %(message)s'
#log_fmt_logfile: '%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s' #log_fmt_logfile: '%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'
#
# This can be used to control logging levels more specificically. This # This can be used to control logging levels more specificically. This
# example sets the main salt library at the 'warning' level, but sets # example sets the main salt library at the 'warning' level, but sets
# 'salt.modules' to log at the 'debug' level: # 'salt.modules' to log at the 'debug' level:
@ -441,6 +437,7 @@
# group1: 'L@foo.domain.com,bar.domain.com,baz.domain.com and bl*.domain.com' # group1: 'L@foo.domain.com,bar.domain.com,baz.domain.com and bl*.domain.com'
# group2: 'G@os:Debian and foo.domain.com' # group2: 'G@os:Debian and foo.domain.com'
##### Range Cluster settings ##### ##### Range Cluster settings #####
########################################## ##########################################
# The range server (and optional port) that serves your cluster information # The range server (and optional port) that serves your cluster information
@ -453,10 +450,10 @@
############################################## ##############################################
# Location of the repo on the master # Location of the repo on the master
# win_repo: '/srv/salt/win/repo' # win_repo: '/srv/salt/win/repo'
#
# Location of the master's repo cache file # Location of the master's repo cache file
# win_repo_mastercachefile: '/srv/salt/win/repo/winrepo.p' # win_repo_mastercachefile: '/srv/salt/win/repo/winrepo.p'
#
# List of git repositories to include with the local repo # List of git repositories to include with the local repo
# win_gitrepos: # win_gitrepos:
# - 'https://github.com/saltstack/salt-winrepo.git' # - 'https://github.com/saltstack/salt-winrepo.git'