Overhauled the master template

salt/files/master

 #  Based on salt version 0.16.3 default config
 {% set salt = pillar.get('salt', {}) -%}
 {% set master = salt.get('master', {}) -%}
+{%- macro get_config(configname, default_value) -%}
+{%- if configname in master -%}
+{{ configname }}: {{ master[configname] }}
+{%- elif configname in salt -%}
+{{ configname }}: {{ salt[configname] }}
+{%- else -%}
+#{{ configname }}: {{ default_value }}
+{%- endif -%}
+{%- endmacro -%}
 ##### Primary configuration settings #####
 ##########################################
 # This configuration file is used to manage the behavior of the Salt Master
 # Per default, the master will automatically include all config files
 # from master.d/*.conf (master.d is a directory in the same directory
 # as the main master config file)
-{%- if 'default_include' in master %}
-default_include: {{ master['default_include'] }}
-{% else %}
-#default_include: master.d/*.conf
-{%- endif %}
+{{ get_config('default_include', 'master.d/*.conf') }}
 
 # The address of the interface to bind to
-{%- if 'interface' in master %}
-interface: {{ master['interface'] }}
-{% else %}
-#interface: 0.0.0.0
-{%- endif %}
+{{ get_config('interface', '0.0.0.0') }}
+
+# Whether the master should listen for IPv6 connections. If this is set to True,
+# the interface option must be adjusted too (for example: "interface: '::'")
+{{ get_config('ipv6', 'False') }}
 
 # The tcp port used by the publisher
-#publish_port: {{ salt.get('publish_port', 4505) }}
+{{ get_config('publish_port', '4505') }}
 
 # 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: {{ master.get('user', 'root') }}
+{{ get_config('user', 'root') }}
 
 # Max open files
 # Each minion connecting to the master uses AT LEAST one file descriptor, the
 # a good way to find the limit is to search the internet for(for example):
 #   raise max open files hard limit debian
 #
-max_open_files: {{ salt.get('max_open_files', 100000) }}
+{{ get_config('max_open_files', '100000') }}
 
 # The number of worker threads to start, these threads are used to manage
 # return calls made from minions to the master, if the master seems to be
 # running slowly, increase the number of threads
-worker_threads: {{ master.get('worker_threads', '5') }}
+{{ get_config('worker_threads', '5') }}
 
 # 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: {{ salt.get('ret_port', 4506) }}
+{{ get_config('ret_port', '4506') }}
 
 # Specify the location of the daemon process ID file
-pidfile: {{ master.get('pid_file', '/var/run/salt-master.pid') }}
+{{ get_config('pidfile', '/var/run/salt-master.pid') }}
 
 # The root directory prepended to these options: pki_dir, cachedir,
 # sock_dir, log_file, autosign_file, extension_modules, key_logfile, pidfile.
-root_dir: {{ salt.get('root_dir', '/' ) }}
+#root_dir: /
+{{ get_config('root_dir', '/') }}
 
 # Directory used to store public key data
-pki_dir: {{ salt.get('pki_dir', '/etc/salt/pki/master') }}
+{{ get_config('pki_dir', '/etc/salt/pki/master') }}
 
 # Directory to store job and cache data
-cachedir: {{ salt.get('cachedir', '/var/cache/salt/master') }}
+{{ get_config('cachedir', '/var/cache/salt/master') }}
 
 # Verify and set permissions on configuration directories at startup
-verify_env: {{ salt.get('verify_env', 'True') }}
+{{ get_config('verify_env', 'True') }}
 
 # Set the number of hours to keep old job information in the job cache
-keep_jobs: {{ salt.get('keep_jobs', 24) }}
+{{ get_config('keep_jobs', '24') }}
 
 # Set the default timeout for the salt command and api, the default is 5
 # seconds
-timeout: {{ salt.get('timeout', 5) }}
+{{ get_config('timeout', '5') }}
 
 # The loop_interval option controls the seconds for the master's maintinance
 # process check cycle. This process updates file server backends, cleans the
 # job cache and executes the scheduler.
-loop_interval: {{ salt.get('loop_interval', 60) }}
+{{ get_config('loop_interval', '60') }}
 
 # Set the default outputter used by the salt command. The default is "nested"
-output: {{ salt.get('output', 'nested') }}
+{{ get_config('output', 'nested') }}
 
 # By default output is colored, to disable colored output set the color value
 # to False
-color: {{ salt.get('color', 'True') }}
+{{ get_config('color', 'True') }}
 
 # Set the directory used to hold unix sockets
-#sock_dir: /var/run/salt/master
-sock_dir: {{ salt.get('sock_dir', '/var/run/salt/master') }}
+{{ get_config('sock_dir', '/var/run/salt/master') }}
 
 # The master maintains a job cache, while this is a great addition it can be
 # a burden on the master for larger deployments (over 5000 minions).
 # Disabling the job cache will make previously executed jobs unavailable to
 # the jobs system and is not generally recommended.
 #
-job_cache: {{ salt.get('job_cache', True) }}
+{{ get_config('job_cache', 'True') }}
 
 # Cache minion grains and pillar data in the cachedir.
-minion_data_cache: {{ salt.get('minion_data_cache', True) }}
+{{ get_config('minion_data_cache', 'True') }}
 
 # The master can include configuration from other files. To enable this,
 # pass a list of paths to this option. The paths can be either relative or
 # Include config from several files and directories:
 # include:
 #   - /etc/salt/extra_config
+{{ get_config('include', '[]') }}
 
 
 #####        Security settings       #####
 # authentication, this is only intended for highly secure environments or for
 # the situation where your keys end up in a bad state. If you run in open mode
 # you do so at your own risk!
-open_mode: {{ salt.get('open_mode', False) }}
+{{ get_config('open_mode', 'False') }}
 
 # Enable auto_accept, this setting will automatically accept all incoming
 # public keys from the minions. Note that this is insecure.
-auto_accept: {{ salt.get('auto_accept', False) }}
+{{ get_config('auto_accept', 'False') }}
 
 # If the autosign_file is specified only incoming keys specified in
 # the autosign_file will be automatically accepted. This is insecure.
 # Regular expressions as well as globing lines are supported.
-autosign_file: {{ salt.get('autosign_file', '/etc/salt/autosign.conf') }}
+{{ get_config('autosign_file', '/etc/salt/autosign.conf') }}
 
 # Enable permissive access to the salt keys.  This allows you to run the
 # master or minion as root, but have a non-root group be given access to
 # you've given access to.  This is potentially quite insecure.
 # If an autosign_file is specified, enabling permissive_pki_access will allow group access
 # to that specific file.
-permissive_pki_access: {{ salt.get('permissive_pki_access', False) }}
+{{ get_config('permissive_pki_access', 'False') }}
 
 # Allow users on the master access to execute specific commands on minions.
 # This setting should be treated with care since it opens up execution
 #     - test.ping
 #     - network.*
 #
-
-client_acl: {{ master.get('client_acl', '{}')}}
+{{ get_config('client_acl', '{}') }}
 
 # Blacklist any of the following users or modules
 #
 # module.
 # This is completely disabled by default.
 #
-# client_acl_blacklist:
-#   users:
-#     - root
-#     - '^(?!sudo_).*$'   #  all non sudo users
-#   modules:
-#     - cmd
-{% if master['client_acl_blacklist'] is defined -%}
+{% if 'client_acl_blacklist' in master -%}
 client_acl_blacklist:
   users:
   {% for user in master['client_acl_blacklist'].get('users', []) -%}
   {% for mod in master['client_acl_blacklist'].get('modules', []) -%}
     - {{ mod }}
   {% endfor -%}
-{% endif -%}
+{% elif 'client_acl_blacklist' in salt  -%}
+client_acl_blacklist:
+  users:
+  {% for user in salt['client_acl_blacklist'].get('users', []) -%}
+    - {{ user }}
+  {% endfor -%}
+  modules:
+  {% for mod in salt['client_acl_blacklist'].get('modules', []) -%}
+    - {{ mod }}
+  {% endfor -%}
+{% else -%}
+# client_acl_blacklist:
+#   users:
+#     - root
+#     - '^(?!sudo_).*$'   #  all non sudo users
+#   modules:
+#     - cmd
+{%- endif %}
 
 # 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.
 #
 # external_auth:
 #   pam:
 #     fred:
 #       - test.*
-
-external_auth: {{ master.get('external_auth', '{}') }}
-
 #
+{{ get_config('external_auth', '{}') }}
+
 # Time (in seconds) for a newly generated token to live. Default: 12 hours
-# token_expire: 43200
-token_expire: {{ salt.get('token_expire', 43200) }}
+{{ get_config('token_expire', '43200') }}
+
+# Allow minions to push files to the master. This is disabled by default, for
+# security purposes.
+{{ get_config('file_recv', 'False') }}
 
 #####    Master Module Management    #####
 ##########################################
 # Manage how master side modules are loaded
 
 # Add any additional locations to look for master runners
-runner_dirs: {{ master.get('runner_dirs', '[]') }}
+{{ get_config('runner_dirs', '[]') }}
 
 # Enable Cython for master side modules
-cython_enable: {{ master.get('cython_enable', False) }}
+{{ get_config('cython_enable', 'False') }}
 
 
 #####      State System settings     #####
 # The state system uses a "top" file to tell the minions what environment to
 # 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.
-state_top: {{ salt.get('state_top', 'top.sls') }}
+{{ get_config('state_top', 'top.sls') }}
 
 # The master_tops option replaces the external_nodes option by creating
 # a plugable system for the generation of external top data. The external_nodes
 # master_tops:
 #   ext_nodes: <Shell command which returns yaml>
 #
-#master_tops: {}
+{{ get_config('master_tops', '{}') }}
 
 # 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
 # return the ENC data. Remember that Salt will look for external nodes AND top
 # files and combine the results if both are enabled!
-#external_nodes: None
-external_nodes: {{ salt.get('external_nodes', 'None') }}
+{{ get_config('external_nodes', 'None') }}
 
 # The renderer to use on the minions to render the state data
-#renderer: yaml_jinja
-renderer: {{ salt.get('renderer', 'yaml_jinja') }}
+{{ get_config('renderer', 'yaml_jinja') }}
 
 # The failhard option tells the minions to stop immediately after the first
 # failure detected in the state execution, defaults to False
-#failhard: False
-failhard: {{ salt.get('failhard', 'False') }}
+{{ get_config('failhard', 'False') }}
 
 # 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.
 # 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.
-#state_verbose: True
-state_verbose: {{ salt.get('state_verbose', 'True') }}
+{{ get_config('state_verbose', 'True') }}
 
 # 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'
 # the output will be shortened to a single line.  If set to 'mixed', the output
 # will be terse unless a state failed, in which case that output will be full.
-#state_output: full
-state_output: {{ salt.get('state_output', 'full') }}
+{{ get_config('state_output', 'full') }}
 
 #####      File Server settings      #####
 ##########################################
 #   prod:
 #     - /srv/salt/prod/services
 #     - /srv/salt/prod/states
-
-{% if salt['file_roots'] is defined -%}
+{% if 'file_roots' in master -%}
+file_roots:
+  {% for name, roots in master['file_roots'].items() -%}
+  {{ name }}:
+    {% for dir in roots -%}
+      - {{ dir }}
+    {% endfor -%}
+  {% endfor -%}
+{% elif 'file_roots' in salt -%}
 file_roots:
   {% for name, roots in salt['file_roots'].items() -%}
   {{ name }}:
       - {{ dir }}
     {% endfor -%}
   {% endfor -%}
-{% endif -%}
+{% else -%}
 #file_roots:
 #  base:
 #    - /srv/salt
+{%- endif %}
 
 # The hash_type is the hash to use when discovering the hash of a file on
-# 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.
-#hash_type: md5
-hash_type: {{ salt.get('hash_type', 'md5') }}
+{{ get_config('hash_type', 'md5') }}
 
 # The buffer size in the file server can be adjusted here:
-#file_buffer_size: 1048576
-file_buffer_size: {{ salt.get('file_buffer_size', '1048576') }}
+{{ get_config('file_buffer_size', '1048576') }}
 
 # A regular expression (or a list of expressions) that will be matched
 # against the file path before syncing the modules and states to the minions.
 # For example, if you manage your custom modules and states in subversion
 # and don't want all the '.svn' folders and content synced to your minions,
 # you could set this to '/\.svn($|/)'. By default nothing is ignored.
-# file_ignore_regex:
-#   - '/\.svn($|/)'
-#   - '/\.git($|/)'
+{% if 'file_ignore_regex' in master -%}
+file_ignore_regex:
+  {% for regex in master['file_ignore_regex'] -%}
+  - {{ regex }}
+  {% endfor -%}
+{% elif 'file_ignore_regex' in salt -%}
+file_ignore_regex:
+  {% for regex in salt['file_ignore_regex'] -%}
+  - {{ regex }}
+  {% endfor -%}
+{% else -%}
+#file_ignore_regex:
+#  - '/\.svn($|/)'
+#  - '/\.git($|/)'
+{%- endif %}
 
 # A file glob (or list of file globs) that will be matched against the file
 # path before syncing the modules and states to the minions. This is similar
 # to file_ignore_regex above, but works on globs instead of regex. By default
 # nothing is ignored.
-# file_ignore_glob:
-#   - '*.pyc'
-#   - '*/somefolder/*.bak'
+{% if 'file_ignore_glob' in master -%}
+file_ignore_glob:
+  {% for glob in master['file_ignore_glob'] -%}
+  - {{ glob }}
+  {% endfor -%}
+{% elif 'file_ignore_glob' in salt -%}
+file_ignore_glob:
+  {% for glob in salt['file_ignore_glob'] -%}
+  - {{ glob }}
+  {% endfor -%}
+{% else -%}
+#file_ignore_glob:
+#  - '*.pyc'
+#  - '*/somefolder/*.bak'
+{%- endif %}
 
 # File Server Backend
 # Salt supports a modular fileserver backend system, this system allows
 # fileserver_backend:
 #   - git
 #   - roots
-
-fileserver_backend: {{ master.get('fileserver_backend', '[]') }}
+{{ get_config('fileserver_backend', '[]') }}
 
 # Git fileserver backend configuration
 # When using the git fileserver backend at least one git remote needs to be
 # environments.
 # Note:  file:// repos will be treated as a remote, so refs you want used must
 # exist in that repo as *local* refs.
-
-{% if master['gitfs_remotes'] is defined -%}
-gitfs_remotes: 
-  {% for remote in master['gitfs_remotes'] -%}
-  - {{ remote }}
-  {% endfor -%}
-{% endif %}
+{{ get_config('gitfs_remotes', '[]') }}
 
 
 #####         Pillar settings        #####
 # Pillar is laid out in the same fashion as the file server, with environments,
 # 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.
-
-{% if salt['pillar_roots'] is defined -%}
+{% if 'pillar_roots' in master -%}
+pillar_roots:
+  {% for name, roots in master['pillar_roots'].items() -%}
+  {{ name }}:
+    {% for dir in roots -%}
+      - {{ dir }}
+    {% endfor -%}
+  {% endfor -%}
+{% elif 'pillar_roots' in salt -%}
 pillar_roots:
   {% for name, roots in salt['pillar_roots'].items() -%}
   {{ name }}:
       - {{ dir }}
     {% endfor -%}
   {% endfor -%}
-{% endif -%}
+{% else %}
 #pillar_roots:
 #  base:
 #    - /srv/pillar
+{%- endif %}
 
+{% if 'ext_pillar' in master -%}
+ext_pillar:
+{% for name, args in master['ext_pillar'].items() -%}
+  - {{ name }}: {{ args }}
+{% endfor -%}
+{% elif 'pillar_roots' in salt -%}
+ext_pillar:
+{% for name, args in salt['ext_pillar'].items() -%}
+  - {{ name }}: {{ args }}
+{% endfor -%}
+{% else %}
 # ext_pillar:
 #   - hiera: /etc/hiera.yaml
 #   - cmd_yaml: cat /etc/salt/yaml
+{%- endif %}
 
 # 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
 # master config file that can then be used on minions.
-#pillar_opts: True
+{{ get_config('pillar_opts', 'True') }}
 
 
 #####          Syndic settings       #####
 
 # Set the order_masters setting to True if this master will command lower
 # masters' syndic interfaces.
-#order_masters: False
-order_masters: {{ salt.get('order_masters', 'False') }}
+{{ get_config('order_masters', 'False') }}
 
 # If this master will be running a salt syndic daemon, syndic_master tells
 # this master where to receive commands from.
-#syndic_master: {{ salt.get('syndic_master', 'masterofmaster') }}
+{{ get_config('syndic_master', 'masterofmaster') }}
+
+# This is the 'ret_port' of the MasterOfMaster
+{{ get_config('syndic_master_port', '4506') }}
+
+# PID file of the syndic daemon
+{{ get_config('syndic_pidfile', '/var/run/salt-syndic.pid') }}
 
+# LOG file of the syndic daemon
+{{ get_config('syndic_log_file', 'syndic.log') }}
 
 #####      Peer Publish settings     #####
 ##########################################
 #       - .*
 # 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!
-{% if salt['peer'] is defined -%}
+{% if 'peer' in master -%}
+peer:
+  {% for name, roots in master['peer'].items() -%}
+  {{ name }}:
+    {% for mod in roots -%}
+      - {{ mod }}
+    {% endfor -%}
+  {% endfor -%}
+{% elif 'peer' in salt -%}
 peer:
   {% for name, roots in salt['peer'].items() -%}
   {{ name }}:
 # peer_run:
 #   foo.example.com:
 #     - manage.up
-{% if salt['peer_run'] is defined -%}
+{% if 'peer_run' in master -%}
+peer_run:
+  {% for name, roots in master['peer_run'].items() -%}
+  {{ name }}:
+    {% for mod in roots -%}
+      - {{ mod }}
+    {% endfor -%}
+  {% endfor -%}
+{% elif 'peer_run' in salt -%}
 peer_run:
   {% for name, roots in salt['peer_run'].items() -%}
   {{ name }}:
 #log_file: /var/log/salt/master
 #log_file: file:///dev/log
 #log_file: udp://loghost:10514
-log_file: {{ salt.get('log_file', '/var/log/salt/master') }}
 
-key_logfile: {{ salt.get('key_logfile', '/var/log/salt/key') }}
+{{ get_config('log_file', '/var/log/salt/master') }}
+{{ get_config('key_logfile', '/var/log/salt/key') }}
 
 # The level of messages to send to the console.
 # One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
-log_level: {{ salt.get('log_level', 'warning') }}
+{{ get_config('log_level', 'warning') }}
 
 # The level of messages to send to the log file.
 # One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
-log_level_logfile: {{ salt.get('log_level_logfile', 'warning') }}
+{{ get_config('log_level_logfile', 'warning') }}
 
 # 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
-#log_datefmt: '%H:%M:%S'
-log_datefmt_logfile: '{{ salt.get('log_datefmt_logfile', '%Y-%m-%d %H:%M:%S') }}'
+{{ get_config('og_datefmt', "'%H:%M:%S'") }}
+{{ get_config('log_datefmt_logfile', "'%Y-%m-%d %H:%M:%S'") }}
 
 # The format of the console logging messages. Allowed formatting options can
 # be seen here: http://docs.python.org/library/logging.html#logrecord-attributes
-#log_fmt_console: '[%(levelname)-8s] %(message)s'
-log_fmt_logfile: '{{ salt.get('log_fmt_logfile', '%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s')}}'
+{{ get_config('log_fmt_console', "'[%(levelname)-8s] %(message)s'") }}
+{{ get_config('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
 # example sets the main salt library at the 'warning' level, but sets
 #     'salt': 'warning',
 #     'salt.modules': 'debug'
 #
-#log_granular_levels: {}
-{% if salt['log_granular_levels'] is defined %}
+{% if 'log_granular_levels' in master %}
+log_granular_levels:
+  {% for name, lvl in salt['log_granular_levels'] %}
+  {{ name }}: {{ lvl }}
+  {% endfor -%}
+{% elif 'log_granular_levels' in salt %}
 log_granular_levels:
   {% for name, lvl in salt['log_granular_levels'] %}
   {{ name }}: {{ lvl }}
   {% endfor -%}
+{% else %}
+#log_granular_levels: {}
 {% endif %}
 
 #####         Node Groups           #####
 # nodegroups:
 #   group1: 'L@foo.domain.com,bar.domain.com,baz.domain.com and bl*.domain.com'
 #   group2: 'G@os:Debian and foo.domain.com'
-{% if salt['nodegroups'] is defined %}
+{% if 'nodegroups' in master %}
+nodegroups:
+  {% for name, lvl in master['nodegroups'] %}
+  {{ name }}: {{ lvl }}
+  {% endfor -%}
+{% elif 'nodegroups' in salt %}
 nodegroups:
   {% for name, lvl in salt['nodegroups'] %}
   {{ name }}: {{ lvl }}
   {% endfor -%}
 {% endif %}
 
+
 #####     Range Cluster settings     #####
 ##########################################
 # The range server (and optional port) that serves your cluster information
 # https://github.com/grierj/range/wiki/Introduction-to-Range-with-YAML-files
 #
-# range_server: range:80
+{{ get_config('range_server', 'range:80') }}
 
 
 #####     Windows Software Repo settings #####
 ##############################################
 # Location of the repo on the master
-# win_repo: '/srv/salt/win/repo'
+{{ get_config('win_repo', '/srv/salt/win/repo') }}
 
 # Location of the master's repo cache file
-# win_repo_mastercachefile: '/srv/salt/win/repo/winrepo.p'
+{{ get_config('win_repo_mastercachefile', '/srv/salt/win/repo/winrepo.p') }}
 
 # List of git repositories to include with the local repo
+{% if 'win_gitrepos' in master %}
+win_gitrepos:
+  {% for repo in master['win_gitrepos'] %}
+  - {{ repo }}
+  {% endfor -%}
+{% elif 'win_gitrepos' in salt %}
+win_gitrepos:
+  {% for repo in salt['win_gitrepos'] %}
+  - {{ repo }}
+  {% endfor -%}
+{% else %}
 # win_gitrepos:
 #   - 'https://github.com/saltstack/salt-winrepo.git'
+{% endif %}