2
0
Commit Graph

29 Commits

Author SHA1 Message Date
Johannes
791025e065 Avoid config key clashes
Fixes #48
2014-10-03 09:43:59 +01:00
Daniel Rodriguez
3bdf2789a1 Added rest_cherrypy section 2014-08-22 22:57:21 -05:00
Wes Turner
bc7ccedf45 Fix nested file,pillar _roots in minion and master templates
See #37 "Fixed file_roots config generation with several environment"
2014-07-22 03:04:26 -05:00
Shaun Carlson
9b730fc0c8 Fixed typo in autoreject_file setting
Fixed an apparent typo in the autoreject_file setting (which was listed as autorejecte_file)
2014-06-05 14:16:57 -06:00
Oleg Tsarev
94da2654e2 Fixed file_roots config generation with several environment 2014-05-10 15:21:37 +02:00
Chris McNabb
028412ee5e use master when if in master 2014-03-28 15:13:33 -04:00
Oleg Tsarev
e3b2ebeb06 Actualized master and minion config files templates 2014-02-11 07:04:03 +04:00
tiger-seo
507f2abc1a possibility to define Halite configuration for salt-master 2014-01-14 12:30:43 +02:00
tiger-seo
f4b839a4fb sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion 2014-01-08 15:29:39 +02:00
Kenneth Wilke
e3a29bf69a ext_pillar fix 2013-08-27 10:33:06 -05:00
Kenneth Wilke
1f71bef33b jijna syntax fix 2013-08-27 10:30:23 -05:00
Kenneth Wilke
e104b3eb41 fixed ext_pillar 2013-08-27 10:28:33 -05:00
Kenneth Wilke
426493b76d fixed ext_pillar 2013-08-27 10:20:42 -05:00
Kenneth Wilke
c080cf37d6 ext_pillar fix 2013-08-23 12:01:36 -05:00
Kenneth Wilke
e83d25b80f newline fix 2013-08-23 11:57:45 -05:00
Kenneth Wilke
98fd674c95 indentation fix 2013-08-23 11:55:09 -05:00
Kenneth Wilke
92b2572734 newline fix 2013-08-23 11:54:12 -05:00
Kenneth Wilke
153feac309 Edited master template
made fileserver_backend and gitfs_remotes look more like expected
2013-08-23 11:52:46 -05:00
Kenneth Wilke
2d598ac2ef corrected spelling mistake 2013-08-13 16:17:53 -05:00
Kenneth Wilke
539d210896 Overhauled the master template 2013-08-13 16:00:08 -05:00
Kenneth Wilke
be1cd4ff73 Overhauled master config template 2013-08-13 15:57:58 -05:00
Kenneth Wilke
b1903eea83 fixed log format string 2013-08-12 17:10:45 -05:00
Kenneth Wilke
d0df360e5d Removed template refs, quoted log_datefmt_logfile 2013-08-12 16:45:39 -05:00
Kenneth Wilke
5403d433a1 fixed small syntax error: geT instead of get 2013-08-12 15:14:23 -05:00
Thomas S Hatch
fa29decc39 Move into salt subdir 2013-07-27 09:30:56 -06:00
Colton Myers
46652ebfda Move everything to root directory for submodule use, Fix #4 2013-07-17 09:35:39 -06:00
Ari Lerner
3ff270fe9f Added the entire master configuration to be set in the pillar 2013-06-18 00:17:04 -07:00
Thomas S Hatch
6a7f64c5ec Start to paramaterize the master config 2013-06-12 22:42:44 -04:00
Thomas S Hatch
349a077675 Start on salt formula 2013-06-12 17:53:26 -06:00