conf/overrides.conf

@@ -2,36 +2,3 @@
 # see https://docs.saltproject.io/en/latest/ref/configuration/master.html for docs on these configs
 
 #cli_summary: true
-
-startup_states: sls
-sls_list:
-  - saltutil.sync_all
-
-# override some defaults
-# ------------------------------------------------------------------------------
-
-hash_type: sha512
-enable_gpu_grains: false
-
-fileserver_followsymlinks: true
-fileserver_ignoresymlinks: false
-pillar_raise_on_missing: true
-
-
-
-# logging
-# ------------------------------------------------------------------------------
-
-cli_summary: true
-color: true
-log_datefmt: '%H:%M:%S'
-log_fmt_console: '%(colorlevel)s  %(asctime)s,%(msecs)03d  %(colorname)-40s  %(message)s'
-log_fmt_jid: '[JID: %(jid)s]'
-log_level: info
-log_level_logfile: debug
-state_output: terse
-state_output_diff: true
-state_output_pct: true
-state_verbose: true
-strip_color: false
-

conf/z_user.conf

@@ -10,13 +10,10 @@ file_roots:
 pillar_roots:
   base:
     - /srv/pillar
-    - /srv/pillar/base
   user:
     - /srv/user/pillar
 
-formula_dirs:
-    - /srv/formulas
-    - /srv/user/formulas
+formula_dirs: ['/srv/formulas', '/srv/user/formulas']
 
 include:
   - minion.d/*