53 Commits

Author	SHA1	Message	Date
Edvinas Klovas	47b37f2ffb	Fix pillar_roots configuration format in master ... This commit fixes how `pillar_roots` are generated and after this fix the generated configuration does not contain any unnecessary new lines: ```yaml pillar_roots: base: /srv/salt/dir1 dev: /srv/salt/dir2 /srv/salt/dir3 locale: /srv/salt/dir4 ``` Before this commit the pillar_roots in `f_defaults.conf` for master would be generated with a lot of empty lines in between directories, like this: ```yaml pillar_roots: base: /srv/salt/dir1 dev: /srv/salt/dir2 /srv/salt/dir3 local: /srv/salt/dir4 ``` The minion configuration is not affected and renders fine.	2015-05-16 15:15:56 +03:00
Matt Parlette	efcefd6579	Updated master.d/f_defaults for 2014.7 ... Added config setting for: * pillar_source_merging_strategy	2015-04-15 15:36:09 -04:00
Brian Jackson	7649c26a0d	Switch config file.recurse to clean by default and tell it to ignore _* ... Salt writes it's schedule file to /etc/salt/{minion,master}.d/_schedule.conf We don't want to stomp all over Salt's files, but we do want a pristine starting point to lay down our managed config. So we use clean: True on the file.recurse call, but we tell it to ignore files that start with an _ We have to rename the current config file (_defaults.conf) because it will be ignored by the rule that ignores Salt's _* config files. This also means we need to clean up old config files (_defaults.conf) and restart the service if we cleaned it up.	2015-03-27 17:58:05 -05:00