Nitin Madhok
a11c39cf32
Merge pull request #111 from iggy/master
Switch config file.recurse to clean by default and tell it to ignore _*
пре 9 година
Forrest
2247630ac8
Merge pull request #114 from irtnog/revert-salt_cloud_certs-pillar-lookup
[bugfix] Reverts lookup of salt_cloud_certs to original pillar key, in line with ...
пре 9 година
Matthew X. Economou
943d7f2dc1
Reverts lookup of salt_cloud_certs to original pillar key, in line with existing documentation and the certificate template file.
Please refer to issue https://github.com/saltstack-formulas/salt-formula/issues/113 .
пре 9 година
Nitin Madhok
74d9ce2a01
Merge pull request #112 from aboe76/fix_api_recursion
Fix recursion in api.service
пре 9 година
Niels Abspoel
9ae8a4d746
Fix recursion in api.service
пре 9 година
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.
пре 9 година
Forrest
e6045d873a
Merge pull request #110 from iggy/master
Add modules to install gitfs backend dependencies
пре 9 година
Brian Jackson
4533cc7d0e
Add modules to install gitfs backend dependencies
Add modules for gitfs dependencies and documentation for how to use them.
пре 9 година
Forrest
d8bf7cdbf0
Merge pull request #108 from iggy/master
Add setting to not install packages
пре 9 година
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.
пре 9 година
Nitin Madhok
751613db7c
Merge pull request #107 from iggy/master
Stop using clean: True on /etc/salt/{minion,master}.d
пре 9 година
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.
пре 9 година
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
пре 9 година
Nitin Madhok
2118cc0905
Update LICENSING year
пре 9 година
Forrest
611e78eb4d
Merge pull request #106 from iggy/cleanup_variable_overwriting
Don't overwrite salt variable
пре 9 година
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.
пре 9 година
Nitin Madhok
6a1fc70477
Merge pull request #102 from aboe76/salt-api
Added salt-api support
пре 9 година
Niels Abspoel
5785091305
Added salt-api support
пре 9 година
Nitin Madhok
61a7bc1ddc
Merge pull request #101 from aboe76/fix_opensuse
fix suse os_family
пре 9 година
Niels Abspoel
5d09355c84
fix suse os_family
пре 9 година
Nitin Madhok
ab93f6f1dc
Merge pull request #100 from aboe76/mine_interval_minion
create config option for mine_interval
пре 9 година
Niels Abspoel
90f23948ef
create config option for mine_interval
пре 9 година
Nitin Madhok
cde11bc1e8
Merge pull request #99 from aboe76/mine_get_master
add mine_get function to master config
пре 9 година
Niels Abspoel
b8e53771f3
add mine_get function to master config
пре 9 година
Forrest
ed0f2fab20
Merge pull request #98 from saxonww/master
don't try to load pkgrepo on non-Debian distros
пре 10 година
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
пре 10 година
Nitin Madhok
1b13259823
Merge pull request #97 from aboe76/multi_master
Fix #39 multi master support to minion
пре 10 година
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.
пре 10 година
Nitin Madhok
22fe873c5b
Merge pull request #96 from aboe76/rest_tornado
added rest_tornado to _defaults.conf
пре 10 година
Niels Abspoel
7ddc1692ec
added rest_tornado to _defaults.conf
see pillar.example for configuration
пре 10 година
Nitin Madhok
f39fff2329
Merge pull request #90 from aboe76/master
Updated map.jinja for archlinux package convention
пре 10 година
Niels Abspoel
de71de216e
Merge pull request #94 from jcftang/master
saltify provider should set correct master
пре 10 година
Jimmy Tang
2e30a44e41
saltify provider should set correct master
This is necessary for the correct settings on the minions when saltifying new hosts
пре 10 година
Nitin Madhok
f2131b05f3
Merge pull request #92 from saltstack-formulas/revert-91-master
Revert "Add mine_functions to master config template"
пре 10 година
Nitin Madhok
fa6c39eccd
Revert "Add mine_functions to master config template"
пре 10 година
Nitin Madhok
5cec66107a
Merge pull request #91 from qbcode/master
Add mine_functions to master config template
пре 10 година
Jimmy Tang
deee69319f
Add mine_functions to master config template
пре 10 година
Niels Abspoel
d071713fa7
update pillar.example for new lookup
пре 10 година
Niels Abspoel
7b4104cf6e
updated archlinux map.jinja, to install salt-zmq
updated the map style without the base='default' parameter
пре 10 година
Wolodja Wentland
d3b920f5c7
Merge pull request #87 from aboe76/master
fix salt-ssh on Arch and Opensuse
пре 10 година
Niels Abspoel
ea4623b0a3
fix salt-ssh on Arch and Opensuse
пре 10 година
Nitin Madhok
07b4fbd86a
Merge pull request #86 from smlloyd/master
Fix: pkgs is undefined
пре 10 година
Simon Lloyd
cb03e885d4
Fix: pkgs is undefined
Update sls files to match name change in map.jinja.
пре 10 година
Nitin Madhok
9821a94104
Merge pull request #85 from aboe76/master
fix #84 with same logic as dnsmasq-formula
пре 10 година
Niels Abspoel
acf5832f68
fix #84 with same logic as dnsmasq-formula
пре 10 година
Seth House
77522d6e56
Merge pull request #81 from aboe76/use_lookup_map.jinja
Removed package_map lookup
пре 10 година
Niels Abspoel
4dc0044772
update use_lookup_map with merges from upstream
пре 10 година
Niels Abspoel
daf04c2688
Merge branch 'master' into use_lookup_map.jinja
пре 10 година
Nitin Madhok
96b409fa90
Merge pull request #82 from juiceinc/master
Add support for presence_events setting in master config template
пре 10 година
Tim O'Guin
b19c3acc77
merged with upstream
пре 10 година