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
Forrest
e6045d873a
Merge pull request #110 from iggy/master
...
Add modules to install gitfs backend dependencies
2015-03-25 19:57:51 -07:00
Brian Jackson
4533cc7d0e
Add modules to install gitfs backend dependencies
...
Add modules for gitfs dependencies and documentation for how to use them.
2015-03-25 21:52:29 -05:00
Forrest
d8bf7cdbf0
Merge pull request #108 from iggy/master
...
Add setting to not install packages
2015-03-25 19:20:42 -07: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
Nitin Madhok
751613db7c
Merge pull request #107 from iggy/master
...
Stop using clean: True on /etc/salt/{minion,master}.d
2015-03-24 12:57:11 -04:00
Brian Jackson
86c7b0a3e5
Add note about config option
...
Add note explaining what clean_config_d_dir does and why you shouldn't set it
to True.
2015-03-24 11:01:58 -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
Nitin Madhok
2118cc0905
Update LICENSING year
2015-03-20 20:05:04 -04:00
Forrest
611e78eb4d
Merge pull request #106 from iggy/cleanup_variable_overwriting
...
Don't overwrite salt variable
2015-03-17 15:27:00 -07: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
Nitin Madhok
6a1fc70477
Merge pull request #102 from aboe76/salt-api
...
Added salt-api support
2015-03-07 16:02:33 -07:00
Niels Abspoel
5785091305
Added salt-api support
2015-03-08 00:01:28 +01:00
Nitin Madhok
61a7bc1ddc
Merge pull request #101 from aboe76/fix_opensuse
...
fix suse os_family
2015-03-07 05:49:35 -07:00
Niels Abspoel
5d09355c84
fix suse os_family
2015-03-07 11:24:50 +01:00
Nitin Madhok
ab93f6f1dc
Merge pull request #100 from aboe76/mine_interval_minion
...
create config option for mine_interval
2015-02-21 01:18:14 +05:30
Niels Abspoel
90f23948ef
create config option for mine_interval
2015-02-20 20:43:14 +01:00
Nitin Madhok
cde11bc1e8
Merge pull request #99 from aboe76/mine_get_master
...
add mine_get function to master config
2015-02-20 02:35:04 +05:30
Niels Abspoel
b8e53771f3
add mine_get function to master config
2015-02-19 21:59:44 +01:00
Forrest
ed0f2fab20
Merge pull request #98 from saxonww/master
...
don't try to load pkgrepo on non-Debian distros
2015-02-07 18:06:05 -08:00
Will Saxon
ae8e4ca492
don't try to load pkgrepo on non-Debian distros
...
fixes #83 by wrapping contents of pkgrepo/init.sls in an {% if %}.
Change-Id: I8260fdf5cf802c0b28197516da374add6c3002a2
2015-02-07 19:26:59 -05:00
Nitin Madhok
1b13259823
Merge pull request #97 from aboe76/multi_master
...
Fix #39 multi master support to minion
2015-02-07 03:02:15 +05:30
Niels Abspoel
23fd8b64af
Fix #39 multi master support to minion
...
This will fix #39
And it will be backwards compatible with the current pillar configuration.
2015-02-06 22:27:55 +01:00
Nitin Madhok
22fe873c5b
Merge pull request #96 from aboe76/rest_tornado
...
added rest_tornado to _defaults.conf
2015-02-06 23:22:52 +05:30
Niels Abspoel
7ddc1692ec
added rest_tornado to _defaults.conf
...
see pillar.example for configuration
2015-02-06 18:46:32 +01:00
Nitin Madhok
f39fff2329
Merge pull request #90 from aboe76/master
...
Updated map.jinja for archlinux package convention
2015-02-06 02:16:17 +05:30
Niels Abspoel
de71de216e
Merge pull request #94 from jcftang/master
...
saltify provider should set correct master
2015-01-26 20:42:45 +01:00
Jimmy Tang
2e30a44e41
saltify provider should set correct master
...
This is necessary for the correct settings on the minions when saltifying new hosts
2015-01-26 17:41:19 +00:00
Nitin Madhok
f2131b05f3
Merge pull request #92 from saltstack-formulas/revert-91-master
...
Revert "Add mine_functions to master config template"
2015-01-16 02:21:01 +05:30
Nitin Madhok
fa6c39eccd
Revert "Add mine_functions to master config template"
2015-01-16 02:20:43 +05:30
Nitin Madhok
5cec66107a
Merge pull request #91 from qbcode/master
...
Add mine_functions to master config template
2015-01-15 22:20:20 +05:30
Jimmy Tang
deee69319f
Add mine_functions to master config template
2015-01-15 16:15:38 +00:00
Niels Abspoel
d071713fa7
update pillar.example for new lookup
2015-01-13 20:13:51 +01:00
Niels Abspoel
7b4104cf6e
updated archlinux map.jinja, to install salt-zmq
...
updated the map style without the base='default' parameter
2015-01-13 20:07:46 +01:00
Wolodja Wentland
d3b920f5c7
Merge pull request #87 from aboe76/master
...
fix salt-ssh on Arch and Opensuse
2015-01-12 09:43:48 +01:00
Niels Abspoel
ea4623b0a3
fix salt-ssh on Arch and Opensuse
2015-01-11 20:35:29 +01:00
Nitin Madhok
07b4fbd86a
Merge pull request #86 from smlloyd/master
...
Fix: pkgs is undefined
2015-01-12 00:12:38 +05:30
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
Nitin Madhok
9821a94104
Merge pull request #85 from aboe76/master
...
fix #84 with same logic as dnsmasq-formula
2015-01-11 23:33:07 +05:30
Niels Abspoel
acf5832f68
fix #84 with same logic as dnsmasq-formula
2015-01-11 12:21:42 +01:00
Seth House
77522d6e56
Merge pull request #81 from aboe76/use_lookup_map.jinja
...
Removed package_map lookup
2015-01-10 18:44:02 -07:00
Niels Abspoel
4dc0044772
update use_lookup_map with merges from upstream
2015-01-07 21:06:02 +01:00
Niels Abspoel
daf04c2688
Merge branch 'master' into use_lookup_map.jinja
2015-01-07 21:03:52 +01:00
Nitin Madhok
96b409fa90
Merge pull request #82 from juiceinc/master
...
Add support for presence_events setting in master config template
2015-01-07 09:03:12 +05:30
Tim O'Guin
b19c3acc77
merged with upstream
2015-01-06 13:10:59 -06: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
Nitin Madhok
e8e01e34d9
Merge pull request #80 from aboe76/update_config_2014.7
...
updated minion _defaults.conf to version 2014.7
2014-12-26 18:14:54 -05:00
Niels Abspoel
5bed5368e2
updated minion _defaults.conf to version 2014.7
2014-12-27 00:00:48 +01:00
Forrest
77c0ecd729
Merge pull request #78 from qbcode/master
...
Add saltify provider, map and profile templates
2014-12-24 12:45:01 -08:00
Forrest
c0af23f439
Merge pull request #79 from rhertzog/misc-bugfixes
...
Fix regression for old salt versions and bugfix for event_return_whitelist/event_return_blacklist options
2014-12-24 12:43:38 -08:00
