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.
pirms 10 gadiem
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.
pirms 10 gadiem
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
pirms 10 gadiem
Ajna Cackovic
2b51a6f0c3
Allow repo options to be set per repo for gitfs_remotes in pillar
pirms 10 gadiem
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.
pirms 10 gadiem
Johannes
791025e065
Avoid config key clashes
Fixes #48
pirms 10 gadiem
Daniel Rodriguez
3bdf2789a1
Added rest_cherrypy section
pirms 10 gadiem
Wes Turner
bc7ccedf45
Fix nested file,pillar _roots in minion and master templates
See #37 "Fixed file_roots config generation with several environment"
pirms 10 gadiem
Shaun Carlson
9b730fc0c8
Fixed typo in autoreject_file setting
Fixed an apparent typo in the autoreject_file setting (which was listed as autorejecte_file)
pirms 10 gadiem
Oleg Tsarev
94da2654e2
Fixed file_roots config generation with several environment
pirms 10 gadiem
Chris McNabb
028412ee5e
use master when if in master
pirms 10 gadiem
Oleg Tsarev
e3b2ebeb06
Actualized master and minion config files templates
pirms 11 gadiem
tiger-seo
507f2abc1a
possibility to define Halite configuration for salt-master
pirms 11 gadiem
tiger-seo
f4b839a4fb
sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion
pirms 11 gadiem
Kenneth Wilke
e3a29bf69a
ext_pillar fix
pirms 11 gadiem
Kenneth Wilke
1f71bef33b
jijna syntax fix
pirms 11 gadiem
Kenneth Wilke
e104b3eb41
fixed ext_pillar
pirms 11 gadiem
Kenneth Wilke
426493b76d
fixed ext_pillar
pirms 11 gadiem
Kenneth Wilke
c080cf37d6
ext_pillar fix
pirms 11 gadiem
Kenneth Wilke
e83d25b80f
newline fix
pirms 11 gadiem
Kenneth Wilke
98fd674c95
indentation fix
pirms 11 gadiem
Kenneth Wilke
92b2572734
newline fix
pirms 11 gadiem
Kenneth Wilke
153feac309
Edited master template
made fileserver_backend and gitfs_remotes look more like expected
pirms 11 gadiem
Kenneth Wilke
2d598ac2ef
corrected spelling mistake
pirms 11 gadiem
Kenneth Wilke
539d210896
Overhauled the master template
pirms 11 gadiem
Kenneth Wilke
be1cd4ff73
Overhauled master config template
pirms 11 gadiem
Kenneth Wilke
b1903eea83
fixed log format string
pirms 11 gadiem
Kenneth Wilke
d0df360e5d
Removed template refs, quoted log_datefmt_logfile
pirms 11 gadiem
Kenneth Wilke
5403d433a1
fixed small syntax error: geT instead of get
pirms 11 gadiem
Thomas S Hatch
fa29decc39
Move into salt subdir
pirms 11 gadiem
Colton Myers
46652ebfda
Move everything to root directory for submodule use, Fix #4
pirms 11 gadiem
Ari Lerner
3ff270fe9f
Added the entire master configuration to be set in the pillar
pirms 11 gadiem
Thomas S Hatch
6a7f64c5ec
Start to paramaterize the master config
pirms 11 gadiem
Thomas S Hatch
349a077675
Start on salt formula
pirms 11 gadiem