2
0
Commit Graph

962 Commits

Author SHA1 Message Date
Forrest Alvarez
c7b1f081f7 Updated readme to match standards 2014-01-28 17:53:07 +00:00
Joseph Hall
4dadffc28d Merge pull request #21 from tiger-seo/master
possibility to define Halite configuration for salt-master
2014-01-14 04:56:47 -08:00
tiger-seo
507f2abc1a possibility to define Halite configuration for salt-master 2014-01-14 12:30:43 +02:00
Seth House
e45258d633 Merge pull request #19 from tiger-seo/master
sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion
2014-01-08 10:09:12 -08: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
David Boucha
bea689e977 Merge pull request #17 from KennethWilke/master
Added module_config section to minion template
2013-09-03 08:46:31 -07:00
Kenneth Wilke
9404ebf915 Added module_config section to minion template 2013-09-03 09:45:24 -05:00
Seth House
fbda93c5e4 Merge pull request #16 from KennethWilke/master
master config fixes
2013-08-27 11:11:01 -07:00
Kenneth Wilke
d337cc2784 Merge branch 'master' of https://github.com/saltstack-formulas/salt-formula 2013-08-27 11:14:18 -05: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
Seth House
ca231053f2 Merge pull request #15 from Linuturk/master
Corrected the typo for the minion configuration file.
2013-08-23 19:38:36 -07:00
Justin Phelps
6282d9570c Corrected the typo for the minion configuration file. 2013-08-23 16:03:26 -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
Joseph Hall
d47edecafd Merge pull request #14 from KennethWilke/master
added salt package mapping for gentoo
2013-08-15 08:40:30 -07:00
Kenneth Wilke
a14ded0b6e really more gentoo 2013-08-15 10:16:54 -05:00
Kenneth Wilke
5c3ffbd43c added salt package mapping for gentoo 2013-08-15 10:15:47 -05:00
Seth House
c0e2423707 Merge pull request #13 from KennethWilke/master
Isolated package mapping and some fixes
2013-08-14 14:22:44 -07:00
Kenneth Wilke
48e2e326b2 fixed missing curly brackets 2013-08-14 16:21:15 -05:00
Kenneth Wilke
fc9db5336a added moar distro package mapping 2013-08-14 16:16:50 -05:00
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
2013-08-14 14:53:29 -05:00
David Boucha
b8cbf60db9 Merge pull request #11 from KennethWilke/master
fixed pillar example, updated minion template
2013-08-14 09:06:22 -07:00
Kenneth Wilke
a940766e7b updated readme 2013-08-14 10:00:14 -05:00
Kenneth Wilke
2420b85913 overhauled minion template 2013-08-14 09:43:46 -05:00
Kenneth Wilke
71418cd1d7 pillar example fix 2013-08-13 16:40:48 -05:00
David Boucha
9a52c6530b Merge pull request #10 from KennethWilke/master
Big template update
2013-08-13 14:21:27 -07: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
David Boucha
3014f4c20b Merge pull request #9 from KennethWilke/master
Removed template refs, quoted log_datefmt_logfile
2013-08-12 15:43:10 -07:00
Kenneth Wilke
8060db1c7b used saltstack formulas repo instead of my own 2013-08-12 17:37:38 -05:00
Kenneth Wilke
3634e3d833 removed bad require line 2013-08-12 17:36:36 -05:00
Kenneth Wilke
48d89a5485 added pillar example 2013-08-12 17:35:25 -05:00
Kenneth Wilke
b9d2e2f9d4 changed salt-master package to salt-master 2013-08-12 17:33:28 -05:00
Kenneth Wilke
76684f638d changed master require to watch, and both to salt-master 2013-08-12 17:33:02 -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
David Boucha
f120f7244f Merge pull request #8 from KennethWilke/master
fixed small syntax error: geT instead of get
2013-08-12 13:13:43 -07:00
Joseph Hall
0cd54925d3 Merge pull request #7 from stp-ip/new_structure
Restructure according to new guidelines.
2013-07-27 15:48:49 -07:00
Michael Grosser
06fd87ced1 Add LICENSE. 2013-07-27 23:33:47 +02:00
Michael Grosser
c431ed9119 Add pillar.example 2013-07-27 23:33:33 +02:00
Thomas S Hatch
fa29decc39 Move into salt subdir 2013-07-27 09:30:56 -06:00
Joseph Hall
7d6ab1e4f1 Merge pull request #6 from AntoineCezar/dev
Add minion's include configurability
2013-07-22 08:01:38 -07:00