0
0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-12-25 09:16:09 +01:00
Commit Graph

18 Commits

Author SHA1 Message Date
Matthew X. Economou
001b034eb5 Replace absolute config pathname prefixes with the config_path variable 2016-03-29 13:28:47 -04:00
Niels Abspoel
6ec31374cb Remove hardcoded paths with {{ slspath }} variable 2015-06-09 23:05:49 +02: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
Brian Jackson
924c04c0d8 Add setting to not install packages
If you are installing Salt via git/pip, the formula will try to overwrite your
install with packaged versions. This setting makes it possible to avoid that.
2015-03-24 12:08:08 -05:00
Brian Jackson
8ebb7f57df Stop using clean: True on /etc/salt/{minion,master}.d
New versions of Salt put config files in /etc/salt/{minion,master}.d. We don't
want to erase them by using a clean: True on the file.recurse. This is a
backward incompatible change, but it's necessary to avoid deleting Salt config
files.

Resolves #104
2015-03-24 10:46:25 -05:00
Brian Jackson
cb3aa80c62 Don't overwrite salt variable
Using a variable named salt is a bad idea when salt already has a variable
named salt.
2015-03-16 23:39:32 -05:00
Simon Lloyd
cb03e885d4 Fix: pkgs is undefined
Update sls files to match name change in map.jinja.
2015-01-11 19:31:05 +01:00
Niels Abspoel
896578a75a Removed package_map lookup
Added map.jinja solution more in line with other formulas,
This also improves issue #30

and pull request #30
2014-12-31 11:52:31 +01:00
Raphaël Hertzog
b93ec22244 Add a “salt.standalone” state 2014-12-21 15:41:16 +01:00
Seth House
1682df8592 Merge remote-tracking branch 'origin/pr/47'
Conflicts:
	salt/master.sls
	salt/minion.sls
2014-10-09 16:39:07 -06:00
Andrew Vant
00e245e20a Added recursive management of minion.d and master.d.
This allows users to easily add configuration settings that the formula
doesn't yet provide, without having to modify the existing templates.
2014-10-06 11:56:07 -04:00
Kevin Bowling
4675d68bd8 Initial FreeBSD support 2014-10-02 00:20:29 -07:00
Johannes
247e6403a7 Add missing .conf to config files
Closes #45
2014-10-01 18:37:09 +01:00
Love Nyberg
75a1f888eb #12 Moved master and minion config file to .d 2014-09-08 21:38:30 +02:00
Kenneth Wilke
a6667cdb81 Isolated package mapping and some fixes
Moved package_table to it's own file, imported by sls files
Moved minion package under watch
Fixed some template mistakes I made
2013-08-14 14:53:29 -05:00
Thomas S Hatch
fa29decc39 Move into salt subdir 2013-07-27 09:30:56 -06:00
Colton Myers
46652ebfda Move everything to root directory for submodule use, Fix #4 2013-07-17 09:35:39 -06:00
Thomas S Hatch
349a077675 Start on salt formula 2013-06-12 17:53:26 -06:00