Forrest
e6045d873a
Merge pull request #110 from iggy/master
Add modules to install gitfs backend dependencies
vor 9 Jahren
Brian Jackson
4533cc7d0e
Add modules to install gitfs backend dependencies
Add modules for gitfs dependencies and documentation for how to use them.
vor 9 Jahren
Forrest
d8bf7cdbf0
Merge pull request #108 from iggy/master
Add setting to not install packages
vor 9 Jahren
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.
vor 9 Jahren
Nitin Madhok
751613db7c
Merge pull request #107 from iggy/master
Stop using clean: True on /etc/salt/{minion,master}.d
vor 9 Jahren
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.
vor 9 Jahren
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
vor 9 Jahren
Nitin Madhok
2118cc0905
Update LICENSING year
vor 9 Jahren
Forrest
611e78eb4d
Merge pull request #106 from iggy/cleanup_variable_overwriting
Don't overwrite salt variable
vor 9 Jahren
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.
vor 9 Jahren
Nitin Madhok
6a1fc70477
Merge pull request #102 from aboe76/salt-api
Added salt-api support
vor 9 Jahren
Niels Abspoel
5785091305
Added salt-api support
vor 9 Jahren
Nitin Madhok
61a7bc1ddc
Merge pull request #101 from aboe76/fix_opensuse
fix suse os_family
vor 9 Jahren
Niels Abspoel
5d09355c84
fix suse os_family
vor 9 Jahren
Nitin Madhok
ab93f6f1dc
Merge pull request #100 from aboe76/mine_interval_minion
create config option for mine_interval
vor 9 Jahren
Niels Abspoel
90f23948ef
create config option for mine_interval
vor 9 Jahren
Nitin Madhok
cde11bc1e8
Merge pull request #99 from aboe76/mine_get_master
add mine_get function to master config
vor 9 Jahren
Niels Abspoel
b8e53771f3
add mine_get function to master config
vor 9 Jahren
Forrest
ed0f2fab20
Merge pull request #98 from saxonww/master
don't try to load pkgrepo on non-Debian distros
vor 9 Jahren
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
vor 10 Jahren
Nitin Madhok
1b13259823
Merge pull request #97 from aboe76/multi_master
Fix #39 multi master support to minion
vor 9 Jahren
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.
vor 9 Jahren
Nitin Madhok
22fe873c5b
Merge pull request #96 from aboe76/rest_tornado
added rest_tornado to _defaults.conf
vor 9 Jahren
Niels Abspoel
7ddc1692ec
added rest_tornado to _defaults.conf
see pillar.example for configuration
vor 9 Jahren
Nitin Madhok
f39fff2329
Merge pull request #90 from aboe76/master
Updated map.jinja for archlinux package convention
vor 9 Jahren
Niels Abspoel
de71de216e
Merge pull request #94 from jcftang/master
saltify provider should set correct master
vor 9 Jahren
Jimmy Tang
2e30a44e41
saltify provider should set correct master
This is necessary for the correct settings on the minions when saltifying new hosts
vor 9 Jahren
Nitin Madhok
f2131b05f3
Merge pull request #92 from saltstack-formulas/revert-91-master
Revert "Add mine_functions to master config template"
vor 9 Jahren
Nitin Madhok
fa6c39eccd
Revert "Add mine_functions to master config template"
vor 9 Jahren
Nitin Madhok
5cec66107a
Merge pull request #91 from qbcode/master
Add mine_functions to master config template
vor 9 Jahren
Jimmy Tang
deee69319f
Add mine_functions to master config template
vor 9 Jahren
Niels Abspoel
d071713fa7
update pillar.example for new lookup
vor 10 Jahren
Niels Abspoel
7b4104cf6e
updated archlinux map.jinja, to install salt-zmq
updated the map style without the base='default' parameter
vor 10 Jahren
Wolodja Wentland
d3b920f5c7
Merge pull request #87 from aboe76/master
fix salt-ssh on Arch and Opensuse
vor 10 Jahren
Niels Abspoel
ea4623b0a3
fix salt-ssh on Arch and Opensuse
vor 10 Jahren
Nitin Madhok
07b4fbd86a
Merge pull request #86 from smlloyd/master
Fix: pkgs is undefined
vor 10 Jahren
Simon Lloyd
cb03e885d4
Fix: pkgs is undefined
Update sls files to match name change in map.jinja.
vor 10 Jahren
Nitin Madhok
9821a94104
Merge pull request #85 from aboe76/master
fix #84 with same logic as dnsmasq-formula
vor 10 Jahren
Niels Abspoel
acf5832f68
fix #84 with same logic as dnsmasq-formula
vor 10 Jahren
Seth House
77522d6e56
Merge pull request #81 from aboe76/use_lookup_map.jinja
Removed package_map lookup
vor 10 Jahren
Niels Abspoel
4dc0044772
update use_lookup_map with merges from upstream
vor 10 Jahren
Niels Abspoel
daf04c2688
Merge branch 'master' into use_lookup_map.jinja
vor 10 Jahren
Nitin Madhok
96b409fa90
Merge pull request #82 from juiceinc/master
Add support for presence_events setting in master config template
vor 10 Jahren
Tim O'Guin
b19c3acc77
merged with upstream
vor 10 Jahren
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
vor 10 Jahren
Nitin Madhok
e8e01e34d9
Merge pull request #80 from aboe76/update_config_2014.7
updated minion _defaults.conf to version 2014.7
vor 10 Jahren
Niels Abspoel
5bed5368e2
updated minion _defaults.conf to version 2014.7
vor 10 Jahren
Forrest
77c0ecd729
Merge pull request #78 from qbcode/master
Add saltify provider, map and profile templates
vor 10 Jahren
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
vor 10 Jahren
Raphaël Hertzog
7fb86b9076
Fix the handling of event_return_whitelist/event_return_blacklist
If those options are set in pillar data, the jinja template
salt/files/master.d/_defaults.conf would fail to compile trying to
evaluate non-existing variables.
Replace those variables with the corresponding dictionnary entries.
vor 10 Jahren