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
7年前
Niels Abspoel
c685ca7767
Merge pull request #277 from Furlot/patch-1
Add http proxy support for minion
7年前
Niels Abspoel
2e792584d2
Merge pull request #281 from vermut/patch-1
Fixes jinja in include block
7年前
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
7年前
Niels Abspoel
5ffed7de5c
fix beacons on dev
7年前
Brian Jackson
cb050736b0
Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge
fix default dict warning with saltstack dev version
7年前
Florian Ermisch
b4d55b80f9
Merge pull request #285 from leansalt/archlinux-pygit-libgit2
Arch Linux: install pygit2 or libgit2 via pacman instead of source
7年前
Brian Jackson
d3dfd1b967
Merge pull request #287 from ek9/alpine-linux-support
Alpine Linux: add basic support
7年前
ek9
d7af7c15bb
Alpine Linux: add basic support
7年前
ek9
8ae39f4700
Arch Linux: install pygit2 or libgit2 via pacman instead of source by default
7年前
Matthew X. Economou
c43657487f
Merge branch 'master' of github.com:saltstack-formulas/salt-formula into fix-root-group-bsd
7年前
Niels Abspoel
9e42d32000
Merge pull request #282 from rocket-labs-sysadmins/beacons
Added beacon configuration support
7年前
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.
7年前
Tobias Martin
fc40847542
fixed beacon variable name
7年前
Tobias Martin
73906a03a5
added beacons configuration support
7年前
Pavel Veretennikov
bad783ea28
Fixes jinja in include block
Some vars were missing {{ }}
Indentation was broken
isinstance is not available in Salt
7年前
Niels Abspoel
caff23424d
fix default dict
7年前
Furlot
45e686b7f2
Add http proxy support for minion
7年前
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年前
Ivan Kadochnikov
fcefad0899
Delete pkgrepo/ubuntu, not used anymore
8年前
Ivan Kadochnikov
13ea551011
Simplify pkgrepo logic, made possible by 3b265a544
8年前
Forrest
01043740dc
Merge pull request #259 from kakwa/separate_engines_config
make the configuration of engines specific to master or minion
8年前
Niels Abspoel
ff8bf379a7
Merge pull request #261 from fizmat/pkgrepo-redhat
Add state that ensures pkgrepo for RedHat is absent
8年前
Forrest
f6551c5fc8
Merge pull request #265 from genuss/pillar_opts
Change default value for pillar_opts
8年前
genuss
8fd8c76d5f
Change default value for pillar_opts
8年前
Forrest
d6affbba39
Merge pull request #263 from robruma/feature/support_master_id_option
Adding support for master_id option
8年前
Rob Ruma
6f4880a258
Adding support for master_id option documented in https://docs.saltstack.com/en/latest/ref/configuration/master.html#master-id
8年前
Ivan Kadochnikov
423d58dd88
Add state that ensures pkgrepo for RedHat is absent
8年前
Forrest
07aa250925
Merge pull request #260 from mothbe/master
typo - top_file_merging_strategy (f_defaults.conf) template
8年前
Marcin Witowski
9d0b6b03d8
fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template
8年前