risca
ef120e56bc
fixed key reserved for lxc_profile file
2017-02-23 23:51:14 +01:00
Niels Abspoel
a26e82f530
Merge pull request #288 from aboe76/fix_beacons
...
fix beacons on dev
2017-02-01 22:53:44 +01:00
Niels Abspoel
c685ca7767
Merge pull request #277 from Furlot/patch-1
...
Add http proxy support for minion
2017-01-22 23:45:25 +01:00
Niels Abspoel
2e792584d2
Merge pull request #281 from vermut/patch-1
...
Fixes jinja in include block
2017-01-22 23:37:28 +01:00
Niels Abspoel
5ffed7de5c
fix beacons on dev
2017-01-21 22:58:31 +01:00
Brian Jackson
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
Tobias Martin
fc40847542
fixed beacon variable name
2017-01-13 15:26:17 +01:00
Tobias Martin
73906a03a5
added beacons configuration support
2017-01-13 14:22:39 +01:00
Pavel Veretennikov
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
Niels Abspoel
caff23424d
fix default dict
2017-01-12 23:40:41 +01:00
Furlot
45e686b7f2
Add http proxy support for minion
2017-01-06 17:12:59 +01:00
Dafydd Jones
8e41067c69
allow non-default config settings in master.d/f_defaults.conf (similar to PR#247)
2016-12-01 21:30:12 +00:00
Forrest
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
Forrest
f6551c5fc8
Merge pull request #265 from genuss/pillar_opts
...
Change default value for pillar_opts
2016-11-09 10:01:41 -08:00
genuss
8fd8c76d5f
Change default value for pillar_opts
2016-11-09 20:48:15 +03:00
Rob Ruma
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
Marcin Witowski
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
carpenti
3098aebcad
add engines as a reserved_keys to not add generic configuration
2016-10-05 22:28:33 +02:00
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.
2016-10-05 21:14:00 +02:00
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)
2016-10-05 10:26:36 +02:00
Niels Abspoel
13a6ecf8b9
add missing files
2016-09-30 22:00:11 +02:00
Jeremy T. Bouse
79fcda8806
Clean up formating of nodegroups
2016-09-04 15:00:03 +00:00
Jeremy T. Bouse
a89d8d9b6b
Add winrepo_provider to master.d/f_defaults.conf
2016-09-04 14:47:39 +00:00
Krzysztof Pawłowski
776c5ecbe6
Add yaml_utf8 option to salt master configuration.
2016-08-24 13:06:24 +02:00
Matthew Richardson
89ece150e6
Tidy up comments, add some docs/examples.
2016-08-23 09:48:39 +01:00
Matthew Richardson
5abdaee5a2
Handle config opts not part of default config.
2016-08-22 11:22:08 +01:00
Matthew X. Economou
12390494cf
Add support for s3fs
2016-07-09 08:29:33 -04:00
Rene Jochum
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
Rene Jochum
478fef683b
Remove trailing whitespaces in config templates.
...
Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-07 16:22:16 +02:00
Forrest
137868bcc1
Merge pull request #237 from msonawane/master
...
add module_config for minions
2016-06-26 18:40:47 -07:00
Manoj Sonawane
98d591eab2
add module_config for minions
2016-06-27 01:34:05 +00:00
Raphaël Hertzog
182098fc16
JSON encode values embedded in the salt-master's configuration file
...
This avoids problems when values are strings containing colons. And it
mimicks what was already done for the salt-minion's configuration file.
Fixes #233 .
2016-06-20 22:24:20 +02:00
risca
ca42d40ef9
added support for LXC profiles
2016-06-07 19:46:08 +02:00
Étienne BERSAC
adad72741e
Render config as JSON
2016-05-29 20:43:45 +02:00
Christian McHugh
ac4ed62c03
Support engine configuration
2016-05-27 23:27:55 -05:00
Brad Thurber
b9ae603fd7
Add support for master eauth LDAP config
2016-05-26 10:52:10 -04:00
Brad Thurber
39479cafe9
add missing gitfs parms to minion config file as well (for use by standalone minions)
2016-04-28 09:43:13 -04:00
Brad Thurber
939aa37028
Cleanup and make closer to the PR submitted for the mainline salt repo master config file
2016-04-20 15:10:55 -04:00
Brad Thurber
c4ef48c5e8
add new gitfs functionality
2016-04-19 12:51:17 -04:00
John Galt
e26b805279
Added version check for provider/driver backwards compatibility
2016-03-31 23:17:35 -07:00
John Galt
c4208bb661
Renamed "provider" to "driver"
2016-03-31 19:39:55 -07:00
Matthew X. Economou
001b034eb5
Replace absolute config pathname prefixes with the config_path variable
2016-03-29 13:28:47 -04:00
a.genus
e97822a0d5
Take mine_functions back
2016-03-25 16:58:06 +03:00
Imran Iqbal
7f36259614
Remove excessive blank lines rendered after "Miscellaneous settings"
2016-03-04 11:50:36 +00:00
Imran Iqbal
c4e116ee8f
Provide Windows repo settings: 2015.8+ master used for pre-2015.8 minions
2016-03-04 11:50:33 +00:00
Imran Iqbal
7474d4239d
Fix Windows repo settings using values from 2015.8 documentation
2016-03-04 11:50:26 +00:00
Niels Abspoel
a4c5b4f322
update 2015.8.7 version config for the minion
2016-02-20 23:25:06 +01:00
Niels Abspoel
bfcaca38a6
merge options from 2015.8.7 version in f_defaults.conf
2016-02-20 21:07:17 +01:00
Kevin Schmidt
ce6849247e
add consul config support
2016-01-19 16:54:05 +00:00
Kevin Schmidt
41f2de74bd
* add gitfs whitelist and blacklist
2016-01-13 11:48:27 +00:00
