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 years ago
Raphaël Hertzog
2f2cd972ac
Use items() method to loop over nodegroups/log_granular_levels dictionaries
Otherwise you get an “ValueError: too many values to unpack” exception
when you make use of those entries in your pillar data.
10 years ago
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 years ago
Niels Abspoel
5029504212
Updated master config file to 2014.7
Fixed explanations, and improved logic code to client_acl
10 years ago
Niels Abspoel
af7f9d722a
more improvements in _defaults.conf
better newlines with iterations.
10 years ago
Nitin Madhok
00a9e0640c
Removing unnecessary -
I don't understand why unnecessary ``-`` were added after and before ``{%-`` and ``-%}``
10 years ago
Tiru Srikantha
70b5c981fa
Test if individual gitfs remote is string
https://github.com/saltstack-formulas/salt-formula/issues/64
Fixes issue where a gitfs remote that has no child options would cause an
error. Also fix up bad yaml in pillar example.
10 years ago
Marvin Frick
868854c2e7
enables use of jinja < 2.6
Commit 2b51a6f0c3
introduced options for gitfs_remotes in a pillar by using a jinja test to see if a parameter is a mapping (dict etc.). This feature however is only available in jinja 2.6 or newer (see http://jinja.pocoo.org/docs/dev/templates/#mapping ).
Although this version of Jinja is available on Ubuntu, other OS / package managers do provide older versions (2.2.1 in RedHat 6).
This change makes use of the "iterable" test which should do the exact same thing.
10 years ago
Marvin Frick
8a187ac13f
adds `yaml_utf8` option to master config
Reference about this config value: http://docs.saltstack.com/en/latest/ref/configuration/master.html#yaml-utf8
Reference why this might be useful: https://github.com/saltstack/salt/issues/3436#issuecomment-61225863
10 years ago
Ajna Cackovic
2b51a6f0c3
Allow repo options to be set per repo for gitfs_remotes in pillar
10 years ago
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 years ago
Johannes
791025e065
Avoid config key clashes
Fixes #48
10 years ago
Daniel Rodriguez
3bdf2789a1
Added rest_cherrypy section
10 years ago
Wes Turner
bc7ccedf45
Fix nested file,pillar _roots in minion and master templates
See #37 "Fixed file_roots config generation with several environment"
10 years ago
Shaun Carlson
9b730fc0c8
Fixed typo in autoreject_file setting
Fixed an apparent typo in the autoreject_file setting (which was listed as autorejecte_file)
10 years ago
Oleg Tsarev
94da2654e2
Fixed file_roots config generation with several environment
10 years ago
Chris McNabb
028412ee5e
use master when if in master
10 years ago
Oleg Tsarev
e3b2ebeb06
Actualized master and minion config files templates
11 years ago
tiger-seo
507f2abc1a
possibility to define Halite configuration for salt-master
11 years ago
tiger-seo
f4b839a4fb
sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion
11 years ago
Kenneth Wilke
e3a29bf69a
ext_pillar fix
11 years ago
Kenneth Wilke
1f71bef33b
jijna syntax fix
11 years ago
Kenneth Wilke
e104b3eb41
fixed ext_pillar
11 years ago
Kenneth Wilke
426493b76d
fixed ext_pillar
11 years ago
Kenneth Wilke
c080cf37d6
ext_pillar fix
11 years ago
Kenneth Wilke
e83d25b80f
newline fix
11 years ago
Kenneth Wilke
98fd674c95
indentation fix
11 years ago
Kenneth Wilke
92b2572734
newline fix
11 years ago
Kenneth Wilke
153feac309
Edited master template
made fileserver_backend and gitfs_remotes look more like expected
11 years ago
Kenneth Wilke
2d598ac2ef
corrected spelling mistake
11 years ago
Kenneth Wilke
539d210896
Overhauled the master template
11 years ago
Kenneth Wilke
be1cd4ff73
Overhauled master config template
11 years ago
Kenneth Wilke
b1903eea83
fixed log format string
11 years ago
Kenneth Wilke
d0df360e5d
Removed template refs, quoted log_datefmt_logfile
11 years ago
Kenneth Wilke
5403d433a1
fixed small syntax error: geT instead of get
11 years ago
Thomas S Hatch
fa29decc39
Move into salt subdir
11 years ago
Colton Myers
46652ebfda
Move everything to root directory for submodule use, Fix #4
11 years ago
Ari Lerner
3ff270fe9f
Added the entire master configuration to be set in the pillar
11 years ago
Thomas S Hatch
6a7f64c5ec
Start to paramaterize the master config
11 years ago
Thomas S Hatch
349a077675
Start on salt formula
11 years ago