Javier Bértoli
edce95f949
Updated master and minion default config files
Added parameters new to 2016.03 (or simply missing in the existing config).
7 роки тому
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 роки тому
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 роки тому
Furlot
45e686b7f2
Add http proxy support for minion
8 роки тому
carpenti
3098aebcad
add engines as a reserved_keys to not add generic configuration
8 роки тому
Matthew Richardson
89ece150e6
Tidy up comments, add some docs/examples.
8 роки тому
Matthew Richardson
5abdaee5a2
Handle config opts not part of default config.
8 роки тому
Rene Jochum
6ae81a9640
Add support for mongodb connection settings to config templates.
Signed-off-by: Rene Jochum <rene@jochums.at>
8 роки тому
Rene Jochum
478fef683b
Remove trailing whitespaces in config templates.
Signed-off-by: Rene Jochum <rene@jochums.at>
8 роки тому
Manoj Sonawane
98d591eab2
add module_config for minions
8 роки тому
Étienne BERSAC
adad72741e
Render config as JSON
8 роки тому
Brad Thurber
39479cafe9
add missing gitfs parms to minion config file as well (for use by standalone minions)
8 роки тому
a.genus
e97822a0d5
Take mine_functions back
8 роки тому
Niels Abspoel
a4c5b4f322
update 2015.8.7 version config for the minion
8 роки тому
Krzysztof Pawłowski
02be0b1367
add support for returner setting in minion configuration
9 роки тому
Devon Stewart
d730d4f2b8
Using cfg_salt['master'] is never the right answer
- When it's iterable, the minion could be running on the master
- When it's a string, there's no advantage over just specifying
`salt:minion:master`
9 роки тому
genus
4ff1a746d6
Add master_type option
9 роки тому
genus
a738198d8b
Add verify_master_pubkey_sign
9 роки тому
Javier Domingo
4344a1311b
Cleanup template for easier user reading
The user will already have it's /etc/salt/minion file, so it doesn't need all this info, and it makes easier to know what has been generated and what not
9 роки тому
Andrew Vant
11efee54c3
Added mine_functions to f_defaults.conf.
9 роки тому
Brian Jackson
7649c26a0d
Switch config file.recurse to clean by default and tell it to ignore _*
Salt writes it's schedule file to /etc/salt/{minion,master}.d/_schedule.conf
We don't want to stomp all over Salt's files, but we do want a pristine
starting point to lay down our managed config. So we use clean: True on the
file.recurse call, but we tell it to ignore files that start with an _
We have to rename the current config file (_defaults.conf) because it will be
ignored by the rule that ignores Salt's _* config files.
This also means we need to clean up old config files (_defaults.conf) and
restart the service if we cleaned it up.
9 роки тому
Niels Abspoel
90f23948ef
create config option for mine_interval
9 роки тому
Niels Abspoel
23fd8b64af
Fix #39 multi master support to minion
This will fix #39
And it will be backwards compatible with the current pillar configuration.
9 роки тому
Niels Abspoel
5bed5368e2
updated minion _defaults.conf to version 2014.7
10 роки тому
Raphaël Hertzog
d4ae38f825
Import the salt/formulas.jinja template with context
This is only needed for salt versions older than 2014.7 that do not
define the global "salt" variable in such context.
10 роки тому
Raphaël Hertzog
445108f87a
Avoid “set salt” jinja calls that mask the usual salt variable
Most include do not expect salt to be something else than the usual salt
variable giving access to all the salt modules. Instead we use cfg_salt.
And for consistency we rename the master/minion variables to
cfg_master/cfg_minion too.
10 роки тому
Raphaël Hertzog
8a828b506e
Use items() method instead of iteritems() for Python 3 compatibility
In Python 3, dict.items() is already an iterator while dict.iteritems() no
longer exits. In Python 2, dict.items() is not an iterator but it works
and the small performance hit doesn't really matter for the salt config
pillar data which is really small.
10 роки тому
Raphaël Hertzog
f46b4f29d8
Add new “salt.formulas” state to manage salt formulas
This state downloads formulas from git repositories and ensures
that they are recorded in the file_roots setting.
10 роки тому
Raphaël Hertzog
b93ec22244
Add a “salt.standalone” state
10 роки тому
Niels Abspoel
af7f9d722a
more improvements in _defaults.conf
better newlines with iterations.
10 роки тому
Niels Abspoel
4b0ec5dc01
Improved jinja spacing in template
This will make the _defaults.conf file for master and minion
better by removing some empty lines in some code blocks
10 роки тому
Niels Abspoel
7da141721b
fix spacing with gitfs.
Updated gitfs jinja, to mirror master file
10 роки тому
Niels Abspoel
ef4bc1a25a
Added support for salt minion gitfs
Gitfs for the minion is possible with salt 2014.7
Updated config _defaults.conf and pillar with example
Tested it on Archlinux with salt-call --local state.highstate
10 роки тому
Andrew Vant
00e245e20a
Added recursive management of minion.d and master.d.
This allows users to easily add configuration settings that the formula
doesn't yet provide, without having to modify the existing templates.
10 роки тому
Johannes
791025e065
Avoid config key clashes
Fixes #48
10 роки тому
Wes Turner
bc7ccedf45
Fix nested file,pillar _roots in minion and master templates
See #37 "Fixed file_roots config generation with several environment"
10 роки тому
Oleg Tsarev
e3b2ebeb06
Actualized master and minion config files templates
10 роки тому
tiger-seo
f4b839a4fb
sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion
11 роки тому
Kenneth Wilke
9404ebf915
Added module_config section to minion template
11 роки тому
Justin Phelps
6282d9570c
Corrected the typo for the minion configuration file.
11 роки тому
Kenneth Wilke
a6667cdb81
Isolated package mapping and some fixes
Moved package_table to it's own file, imported by sls files
Moved minion package under watch
Fixed some template mistakes I made
11 роки тому
Kenneth Wilke
2420b85913
overhauled minion template
11 роки тому
Thomas S Hatch
fa29decc39
Move into salt subdir
11 роки тому
Antoine Cezar
c7af1d12a1
Add minion's include configurability
11 роки тому
Colton Myers
46652ebfda
Move everything to root directory for submodule use, Fix #4
11 роки тому
Antoine Cezar
0c394abad1
Add minion managed file
11 роки тому