Javier Bértoli
7093a32968
Simplify logic
7 лет назад
Javier Bértoli
997194c992
Wrong list name in config file
7 лет назад
Javier Bértoli
edce95f949
Updated master and minion default config files
Added parameters new to 2016.03 (or simply missing in the existing config).
7 лет назад
Niels Abspoel
03ec0dce2d
Merge pull request #301 from vquiering/move_to_publisher_acl
Add new publisher_acl to salt master config
7 лет назад
Niels Abspoel
ca204ea8c4
Merge pull request #302 from vquiering/fix_external_auth_config
add salt master config template external_auth settings
7 лет назад
Niels Abspoel
4b5ea5a544
Merge pull request #303 from tampakrap/syndic_user
add syndic_user option in the master config
7 лет назад
Theo Chatzimichos
57498d1645
add syndic_user option in the master config
7 лет назад
Vitali Quiering
f7189e2900
User publisher_acl setting in salt master config even if used client_acl in
pillar (backwards compatibility)
7 лет назад
Vitali Quiering
894bd15c79
fix salt master config template to use external_auth settings
7 лет назад
Vitali Quiering
d3b46a3648
add publisher_acl to salt master config
7 лет назад
puneet kandhari
31229c5a0d
Merge pull request #298 from 0xf10e/no_mapping_workaround
Hack to make rendering work on CentOS 6
7 лет назад
Florian Ermisch
e86e6fc221
Work around missing `is mapping` on CentOS/RHEL 6
Checks for 'dict' in `x.__class__.__name__` b/c
neither `type()` nor `isinstance()` is available.
7 лет назад
Florian Ermisch
5327e921fe
Hack to make rendering work on CentOS 6
!! Not tested with an actual !!
!! configured `ext_pillar` yet !!
- jinja on RHEL/CentOS 6 has no 'mapping'
test (see salt-formula issue #193 )
- {% do ... %} allows no assignment, only
function calls
- of course, `type(foo) is dict` doesn't
work because it's no jinja test
- maybe `.isinstance()` would be nicer/more
reliable
7 лет назад
Niels Abspoel
d34f63fdf0
Merge pull request #297 from Sjd-Risca/fix_lxc_keyword
fixed key reserved for lxc_profile file
7 лет назад
risca
ef120e56bc
fixed key reserved for lxc_profile file
7 лет назад
Niels Abspoel
a26e82f530
Merge pull request #288 from aboe76/fix_beacons
fix beacons on dev
8 лет назад
Niels Abspoel
c685ca7767
Merge pull request #277 from Furlot/patch-1
Add http proxy support for minion
8 лет назад
Niels Abspoel
2e792584d2
Merge pull request #281 from vermut/patch-1
Fixes jinja in include block
8 лет назад
Niels Abspoel
724e603689
Merge pull request #283 from irtnog/fix-root-group-bsd
Use a different group name for GID 0 depending on the minion's O/S
8 лет назад
Niels Abspoel
5ffed7de5c
fix beacons on dev
8 лет назад
Brian Jackson
cb050736b0
Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge
fix default dict warning with saltstack dev version
8 лет назад
Florian Ermisch
b4d55b80f9
Merge pull request #285 from leansalt/archlinux-pygit-libgit2
Arch Linux: install pygit2 or libgit2 via pacman instead of source
8 лет назад
Brian Jackson
d3dfd1b967
Merge pull request #287 from ek9/alpine-linux-support
Alpine Linux: add basic support
8 лет назад
ek9
d7af7c15bb
Alpine Linux: add basic support
8 лет назад
ek9
8ae39f4700
Arch Linux: install pygit2 or libgit2 via pacman instead of source by default
8 лет назад
Matthew X. Economou
c43657487f
Merge branch 'master' of github.com:saltstack-formulas/salt-formula into fix-root-group-bsd
8 лет назад
Niels Abspoel
9e42d32000
Merge pull request #282 from rocket-labs-sysadmins/beacons
Added beacon configuration support
8 лет назад
Matthew X. Economou
3746f08f2f
Use a different group name for GID 0 depending on the minion's O/S
Some Unix variants name GID 0 "wheel". Unfortunately, one cannot
specify this group by ID, because Python conflates integer 0 with
boolean False, nor can one specify this group using the string '0',
because of assumptions in the Salt or Python codebases regarding group
names.
8 лет назад
Tobias Martin
fc40847542
fixed beacon variable name
8 лет назад
Tobias Martin
73906a03a5
added beacons configuration support
8 лет назад
Pavel Veretennikov
bad783ea28
Fixes jinja in include block
Some vars were missing {{ }}
Indentation was broken
isinstance is not available in Salt
8 лет назад
Niels Abspoel
caff23424d
fix default dict
8 лет назад
Furlot
45e686b7f2
Add http proxy support for minion
8 лет назад
Brian Jackson
f58562beeb
Merge pull request #276 from saltstack-formulas/fix_pygit2_debian
Fix pygit2-libgit2 builds on Debian like platforms.
8 лет назад
Rene Jochum
6fab0c54c6
Merge pull request #274 from jebas/master
Correction for Fedora packaging.
8 лет назад
Rene Jochum
e329bda7bf
Fix pygit2-libgit2 builds on Debian like platforms.
Signed-off-by: Rene Jochum <rene@jochums.at>
8 лет назад
Jeff Baskin
0166cd4097
Added fedora.
8 лет назад
Forrest
13f06a8ae5
Merge pull request #273 from jerrykan/saltapi
Have salt-api service watch the master config files
8 лет назад
John Kristensen
43663fec1b
Have salt-api service watch the master config files
The salt-api service is configured using the master config files but is
not restarted when the master is restarted. We need the salt-api service
to watch the master config files to ensure that any config changes are
picked up.
8 лет назад
Forrest
f3f2251d75
Merge pull request #271 from dafyddj/add-master-other-settings
allow non-default config settings in master.d/f_defaults.conf …
8 лет назад
Dafydd Jones
8e41067c69
allow non-default config settings in master.d/f_defaults.conf (similar to PR#247)
8 лет назад
Brian Jackson
d68c0b63ee
Merge pull request #267 from fizmat/pkgrepo-cleanup
Pkgrepo cleanup
8 лет назад
Forrest
111cbd44d1
Merge pull request #269 from mattwillsher/smartos-support
Correct SmartOS config path
8 лет назад
Matt Willsher
157f356442
Correct SmartOS config path
8 лет назад
Forrest
88794c8c62
Merge pull request #268 from mattwillsher/smartos-support
Add SmartOS salt-master, minion and gitfs support
8 лет назад
Matt Willsher
5b87c50e46
Add SmartOS salt-master and gitfs support
8 лет назад
Forrest
af02bc5b78
Merge pull request #266 from fizmat/arch-update
update map.jinja after Arch renamed the package
8 лет назад
Ivan Kadochnikov
8552113226
update map.jinja after Arch renamed the package
8 лет назад
Ivan Kadochnikov
fd0b200fea
Delete repotype from map.jinja, unused after 8f2191471
8 лет назад
Ivan Kadochnikov
e18eeffb5e
Delete debian saltstack repo gpg, not used since 87f3e849d2
8 лет назад