Niels Abspoel
c685ca7767
Merge pull request #277 from Furlot/patch-1
Add http proxy support for minion
7 years ago
Niels Abspoel
2e792584d2
Merge pull request #281 from vermut/patch-1
Fixes jinja in include block
7 years ago
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 years ago
Brian Jackson
cb050736b0
Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge
fix default dict warning with saltstack dev version
7 years ago
Florian Ermisch
b4d55b80f9
Merge pull request #285 from leansalt/archlinux-pygit-libgit2
Arch Linux: install pygit2 or libgit2 via pacman instead of source
7 years ago
Brian Jackson
d3dfd1b967
Merge pull request #287 from ek9/alpine-linux-support
Alpine Linux: add basic support
7 years ago
ek9
d7af7c15bb
Alpine Linux: add basic support
7 years ago
ek9
8ae39f4700
Arch Linux: install pygit2 or libgit2 via pacman instead of source by default
7 years ago
Matthew X. Economou
c43657487f
Merge branch 'master' of github.com:saltstack-formulas/salt-formula into fix-root-group-bsd
7 years ago
Niels Abspoel
9e42d32000
Merge pull request #282 from rocket-labs-sysadmins/beacons
Added beacon configuration support
7 years ago
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 years ago
Tobias Martin
fc40847542
fixed beacon variable name
7 years ago
Tobias Martin
73906a03a5
added beacons configuration support
7 years ago
Pavel Veretennikov
bad783ea28
Fixes jinja in include block
Some vars were missing {{ }}
Indentation was broken
isinstance is not available in Salt
7 years ago
Niels Abspoel
caff23424d
fix default dict
7 years ago
Furlot
45e686b7f2
Add http proxy support for minion
7 years ago
Brian Jackson
f58562beeb
Merge pull request #276 from saltstack-formulas/fix_pygit2_debian
Fix pygit2-libgit2 builds on Debian like platforms.
8 years ago
Rene Jochum
6fab0c54c6
Merge pull request #274 from jebas/master
Correction for Fedora packaging.
8 years ago
Rene Jochum
e329bda7bf
Fix pygit2-libgit2 builds on Debian like platforms.
Signed-off-by: Rene Jochum <rene@jochums.at>
8 years ago
Jeff Baskin
0166cd4097
Added fedora.
8 years ago
Forrest
13f06a8ae5
Merge pull request #273 from jerrykan/saltapi
Have salt-api service watch the master config files
8 years ago
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 years ago
Forrest
f3f2251d75
Merge pull request #271 from dafyddj/add-master-other-settings
allow non-default config settings in master.d/f_defaults.conf …
8 years ago
Dafydd Jones
8e41067c69
allow non-default config settings in master.d/f_defaults.conf (similar to PR#247)
8 years ago
Brian Jackson
d68c0b63ee
Merge pull request #267 from fizmat/pkgrepo-cleanup
Pkgrepo cleanup
8 years ago
Forrest
111cbd44d1
Merge pull request #269 from mattwillsher/smartos-support
Correct SmartOS config path
8 years ago
Matt Willsher
157f356442
Correct SmartOS config path
8 years ago
Forrest
88794c8c62
Merge pull request #268 from mattwillsher/smartos-support
Add SmartOS salt-master, minion and gitfs support
8 years ago
Matt Willsher
5b87c50e46
Add SmartOS salt-master and gitfs support
8 years ago
Forrest
af02bc5b78
Merge pull request #266 from fizmat/arch-update
update map.jinja after Arch renamed the package
8 years ago
Ivan Kadochnikov
8552113226
update map.jinja after Arch renamed the package
8 years ago
Ivan Kadochnikov
fd0b200fea
Delete repotype from map.jinja, unused after 8f2191471
8 years ago
Ivan Kadochnikov
e18eeffb5e
Delete debian saltstack repo gpg, not used since 87f3e849d2
8 years ago
Ivan Kadochnikov
fcefad0899
Delete pkgrepo/ubuntu, not used anymore
8 years ago
Ivan Kadochnikov
13ea551011
Simplify pkgrepo logic, made possible by 3b265a544
8 years ago
Forrest
01043740dc
Merge pull request #259 from kakwa/separate_engines_config
make the configuration of engines specific to master or minion
8 years ago
Niels Abspoel
ff8bf379a7
Merge pull request #261 from fizmat/pkgrepo-redhat
Add state that ensures pkgrepo for RedHat is absent
8 years ago
Forrest
f6551c5fc8
Merge pull request #265 from genuss/pillar_opts
Change default value for pillar_opts
8 years ago
genuss
8fd8c76d5f
Change default value for pillar_opts
8 years ago
Forrest
d6affbba39
Merge pull request #263 from robruma/feature/support_master_id_option
Adding support for master_id option
8 years ago
Rob Ruma
6f4880a258
Adding support for master_id option documented in https://docs.saltstack.com/en/latest/ref/configuration/master.html#master-id
8 years ago
Ivan Kadochnikov
423d58dd88
Add state that ensures pkgrepo for RedHat is absent
8 years ago
Forrest
07aa250925
Merge pull request #260 from mothbe/master
typo - top_file_merging_strategy (f_defaults.conf) template
8 years ago
Marcin Witowski
9d0b6b03d8
fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template
8 years ago
carpenti
3098aebcad
add engines as a reserved_keys to not add generic configuration
8 years ago
carpenti
08d10376ab
implementing retro-compatible behavior
Using the old salt.engines pillar and merging it with the new
salt.[master|minion].engines pillar.
This way, it doesn't break previous behavior and permits to define
common engines on master and minion.
In the merge, the salt.[master|minion].engines pillar takes precedence
if conflict as it's the more specific pillar.
8 years ago
carpenti
c27bfd92b7
make the configuration of engines specific to master or minion
the engines are now configured using the following pillars:
* salt.master.engines
* salt.minion.engines
instead of a global salt.engines pillar.
Note: the pillar.example provided seems to assume this behaviour.
(the pillar is salt.master.engines.slack and not salt.engines.slack)
8 years ago
Forrest
5e9c937931
Merge pull request #258 from aboe76/enable_salt_minion_standalone
fix minion daemon to be enabled if master_type is set to disable
8 years ago
Niels Abspoel
64e7376fe4
fix minion daemon to be enabled if master_type is set to disable
8 years ago
Forrest
e76880d500
Merge pull request #257 from aboe76/salt-minion_standalone_with_service
add option to start minion service if master_type is set to disable
8 years ago