89f3653de9
Merge pull request #517 from ze42/log_fmt_console
...
fix(log_fmt_console): double option in config
2021-12-27 17:54:52 +00:00
7d26191578
Merge pull request #518 from ze42/sorted_extra_options
...
fix: sort extra options in configuration
2021-12-04 21:17:19 +01:00
5b7d7ea70e
fix(master): master.d template to support saltclass ext_pillar
2021-11-30 23:15:21 +00:00
89cdcec595
fix: sort extra options in configuration
...
Ensure extra options in generated configuration is sorted, to ensure stable
configuration.
2021-10-28 11:54:09 +02:00
b705e44378
fix(log_fmt_console): double option in config
...
When option was specified, it appeared twice in config, making configuration
file buggy, and not loaded.
2021-10-28 11:41:18 +02:00
a89fb3f4aa
fix: revert to using `is mapping` in Jinja2
...
* CVE-2021-25283 enables Jinja2 safe mode, which breaks use of
`'dict' in x.__class__.__name__` workaround
* Workaround no longer needed as CentOS 6 is EOL
2021-03-02 00:40:07 +00:00
3888519cdf
Merge pull request #381 from starops/external_auth-file-directives
...
Add support for file external_auth special directives
2018-12-19 20:41:25 +01:00
f43cc94362
Support fileserver_list_cache_time in master configuration
2018-08-09 09:06:00 +02:00
ec33ba5fab
Add support for file external_auth special directives
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2018-08-06 10:26:17 +02:00
3e6e6028ae
Support publisher_acl minion-level commands
2018-07-11 14:36:41 +02:00
1a5027ef8c
Handle pillar params with child params. ( #372 )
2018-06-22 10:41:10 +02:00
d1e4768cdb
Quotation and ipv6 ( #355 )
...
* Added quotration around globing rules
2018-04-05 12:45:59 +02:00
3c731605cc
fix iteritems python3
2018-03-06 20:52:04 +01:00
e92f6f80b0
Fix default value to match array type of pillar
2018-01-30 12:57:31 -08:00
334d5de72b
Support profiles within engine.conf to be able to configure sqs_events, https://docs.saltstack.com/en/latest/ref/engines/all/salt.engines.sqs_events.html
2018-01-29 12:28:48 -08:00
d5c10f5600
fix indenting around peer run. Convert extra configs from json to yaml
2017-08-28 07:04:43 +01:00
d6389b8a24
Merge pull request #313 from iondulgheru/master
...
Fix master_tops configuration rendering
2017-08-13 22:38:48 +02:00
b8273b9c3f
Fix lists join error ( #317 )
2017-06-09 08:34:55 -03:00
165f2d727c
Fix master_tops configuration rendering
2017-05-24 18:31:36 +03:00
9331997269
Exclude reactors from f_defaults.conf
2017-05-22 20:56:13 -03:00
561eb4c5c8
Reactors should be in an array
2017-05-22 19:34:31 -03:00
442806ab9e
Allow to specify different reactors for minions and masters
2017-05-22 19:20:36 -03:00
68a2b72519
Fix rendering of external_auth config.
...
This now properly also supports per user, per minion as well as
function argument limiting.
2017-05-09 13:34:44 +02:00
7093a32968
Simplify logic
2017-04-10 12:14:12 -03:00
997194c992
Wrong list name in config file
2017-04-10 12:11:09 -03:00
edce95f949
Updated master and minion default config files
...
Added parameters new to 2016.03 (or simply missing in the existing config).
2017-04-09 14:27:30 -03:00
03ec0dce2d
Merge pull request #301 from vquiering/move_to_publisher_acl
...
Add new publisher_acl to salt master config
2017-04-08 12:05:15 +02:00
ca204ea8c4
Merge pull request #302 from vquiering/fix_external_auth_config
...
add salt master config template external_auth settings
2017-04-08 12:04:57 +02:00
57498d1645
add syndic_user option in the master config
2017-04-07 12:12:21 +02:00
f7189e2900
User publisher_acl setting in salt master config even if used client_acl in
...
pillar (backwards compatibility)
2017-03-27 08:39:05 +02:00
894bd15c79
fix salt master config template to use external_auth settings
2017-03-25 19:59:16 +01:00
d3b46a3648
add publisher_acl to salt master config
2017-03-24 13:07:19 +01:00
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.
2017-02-24 18:10:54 +01:00
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
2017-02-24 13:40:40 +01:00
ef120e56bc
fixed key reserved for lxc_profile file
2017-02-23 23:51:14 +01:00
caff23424d
fix default dict
2017-01-12 23:40:41 +01:00
8e41067c69
allow non-default config settings in master.d/f_defaults.conf (similar to PR#247)
2016-12-01 21:30:12 +00:00
01043740dc
Merge pull request #259 from kakwa/separate_engines_config
...
make the configuration of engines specific to master or minion
2016-11-09 12:08:33 -08:00
f6551c5fc8
Merge pull request #265 from genuss/pillar_opts
...
Change default value for pillar_opts
2016-11-09 10:01:41 -08:00
8fd8c76d5f
Change default value for pillar_opts
2016-11-09 20:48:15 +03:00
6f4880a258
Adding support for master_id option documented in https://docs.saltstack.com/en/latest/ref/configuration/master.html#master-id
2016-10-14 08:25:18 -04:00
9d0b6b03d8
fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template
2016-10-07 00:48:59 +02:00
3098aebcad
add engines as a reserved_keys to not add generic configuration
2016-10-05 22:28:33 +02:00
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.
2016-10-05 21:14:00 +02:00
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)
2016-10-05 10:26:36 +02:00
79fcda8806
Clean up formating of nodegroups
2016-09-04 15:00:03 +00:00
a89d8d9b6b
Add winrepo_provider to master.d/f_defaults.conf
2016-09-04 14:47:39 +00:00
776c5ecbe6
Add yaml_utf8 option to salt master configuration.
2016-08-24 13:06:24 +02:00
12390494cf
Add support for s3fs
2016-07-09 08:29:33 -04:00
6ae81a9640
Add support for mongodb connection settings to config templates.
...
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-07 18:44:51 +02:00
N
Niels Abspoel
Robert Fairburn
Adrien "ze" Urban
Dafydd Jones
Niels Abspoel
Krzysztof Pawłowski
Johannes Löthberg
Alexandre Anriot
Matthew Richardson
Jerzy Drozdz
Niels Abspoel
Stefan Reimer
Christian McHugh
Javier Bértoli
Ion Dulgheru
Heinz Wiesinger
Theo Chatzimichos
Vitali Quiering
Florian Ermisch
Florian Ermisch
risca
Forrest
genuss
Rob Ruma
Marcin Witowski
carpenti
Jeremy T. Bouse
Matthew X. Economou
Rene Jochum