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
7540dc90aa
fix(minion): update config parameter saltenv
...
`environment` is being deprecated, renamed to `saltenv`
2021-12-14 11:12:37 -03: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
97299983ba
Ensure consistent ordering of module_config entries
...
Right now when you set module_config entries in your pillar data
like this:
salt:
minion:
module_config:
smtp.from: 'Kali Salt <admins+salt@kali.org>'
smtp.to: 'Kali Admins <admins+salt@kali.org>'
smtp.host: localhost
smtp.subject: 'Results of salt actions on'
smtp.fields: id,fun
On each run, you will always a different ordering of the various
fields in the minion configuration file, leading to spurious restart
of the minion and admin annoyance:
ID: salt-minion
Function: file.recurse
Name: /etc/salt/minion.d
Result: True
Comment: Recursively updated /etc/salt/minion.d
Started: 13:39:25.689775
Duration: 874.318 ms
Changes:
----------
/etc/salt/minion.d/f_defaults.conf:
----------
diff:
---
+++
@@ -930,10 +930,10 @@
# A dict for the test module:
#test.baz: {spam: sausage, cheese: bread}
#
+smtp.fields: id,fun
+smtp.from: Kali Salt <admins+salt@kali.org>
smtp.to: Kali Admins <admins+salt@kali.org>
-smtp.fields: id,fun
smtp.host: localhost
-smtp.from: Kali Salt <admins+salt@kali.org>
smtp.subject: Results of salt actions on
With the change here, this bad behaviour is gone...
2021-04-09 16:02:36 +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
042e9baad3
Add 'return' to reserved_keys in minion config
...
This prevents the `return` key being duplicated in the minion config by L1205
2019-08-15 14:16:57 +01:00
549c73c739
Fix support for extra config values as mappings
2018-11-12 17:54:11 +01:00
d87d858a87
Merge pull request #378 from mrichar1/extra_config
...
Handle other non-iterable values like int/float.
2018-07-02 11:12:05 +02:00
aff75ce8ac
Handle other non-iterable values like int/float.
2018-07-01 22:09:34 +01:00
a1a65ce1e9
Merge pull request #375 from mrichar1/extra_config
...
Handle extra config where value is a list (minion)
2018-06-29 17:06:50 +02:00
1a5027ef8c
Handle pillar params with child params. ( #372 )
2018-06-22 10:41:10 +02:00
c363aa9e04
Handle extra config where value is a list.
2018-06-12 14:40:54 +01:00
2761d90626
minion: master_alive_interval: remove duplicate ( #369 )
...
Remove commented version and associated comment, as we still have the same
option earlier in config with an other valid comment.
2018-06-11 11:12:23 +02:00
d2ceaab7dd
only set master_alive_interval once ( #368 )
...
closes #367
2018-06-08 17:12:07 +02:00
9f33d2afe1
[Minion] [returner] [Elasticsearch] Yaml read patch + example.pillar update ( #359 )
...
* Minion/returner/elasticsearch yaml read fix.
* Improved the documentation for the elasticsearch returner
2018-04-17 22:26:45 +02:00
9ef5335f7b
Update f_defaults.conf to support elasticsearch returner ( #335 )
...
Proposed pull request for elasticsearch returner in the minion.d/f_defaults.conf file
2017-09-29 22:13:00 +02:00
ec8241c6fd
Added minion scheduler configuration
2017-07-25 10:13:51 -04:00
b8273b9c3f
Fix lists join error ( #317 )
2017-06-09 08:34:55 -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
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
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
a26e82f530
Merge pull request #288 from aboe76/fix_beacons
...
fix beacons on dev
2017-02-01 22:53:44 +01:00
c685ca7767
Merge pull request #277 from Furlot/patch-1
...
Add http proxy support for minion
2017-01-22 23:45:25 +01:00
2e792584d2
Merge pull request #281 from vermut/patch-1
...
Fixes jinja in include block
2017-01-22 23:37:28 +01:00
5ffed7de5c
fix beacons on dev
2017-01-21 22:58:31 +01:00
cb050736b0
Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge
...
fix default dict warning with saltstack dev version
2017-01-21 11:41:49 -08:00
fc40847542
fixed beacon variable name
2017-01-13 15:26:17 +01:00
73906a03a5
added beacons configuration support
2017-01-13 14:22:39 +01:00
bad783ea28
Fixes jinja in include block
...
Some vars were missing {{ }}
Indentation was broken
isinstance is not available in Salt
2017-01-13 14:58:59 +02:00
caff23424d
fix default dict
2017-01-12 23:40:41 +01:00
45e686b7f2
Add http proxy support for minion
2017-01-06 17:12:59 +01: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
13a6ecf8b9
add missing files
2016-09-30 22:00:11 +02:00
89ece150e6
Tidy up comments, add some docs/examples.
2016-08-23 09:48:39 +01:00
5abdaee5a2
Handle config opts not part of default config.
2016-08-22 11:22:08 +01: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
478fef683b
Remove trailing whitespaces in config templates.
...
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-07 16:22:16 +02:00
137868bcc1
Merge pull request #237 from msonawane/master
...
add module_config for minions
2016-06-26 18:40:47 -07:00
98d591eab2
add module_config for minions
2016-06-27 01:34:05 +00:00
adad72741e
Render config as JSON
2016-05-29 20:43:45 +02:00
39479cafe9
add missing gitfs parms to minion config file as well (for use by standalone minions)
2016-04-28 09:43:13 -04:00
e97822a0d5
Take mine_functions back
2016-03-25 16:58:06 +03:00
a4c5b4f322
update 2015.8.7 version config for the minion
2016-02-20 23:25:06 +01:00
adb0c7008d
removing accidentally committed files
2016-01-09 21:45:23 +01:00
cbe5763668
fix pillar and libvirt
2016-01-09 19:39:47 +01:00
N
Javier Bértoli
Adrien "ze" Urban
Raphaël Hertzog
Dafydd Jones
Ryan Walder
Heinz Wiesinger
Niels Abspoel
Matthew Richardson
Matthew Richardson
ze42
Justin Riley
Felix Russell
Andrew Ernst
Elliot Chen
Florian Ermisch
Niels Abspoel
Brian Jackson
Tobias Martin
Pavel Veretennikov
Furlot
carpenti
Rene Jochum
Forrest
Manoj Sonawane
Étienne BERSAC
Brad Thurber
a.genus