salt-formula

Template

Author	SHA1	Message	Date
Forrest	05087a8d42	Merge pull request #51 from andrew-vant/salt.d Added recursive management of minion.d and master.d.	2014-10-06 09:15:53 -07:00
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.	2014-10-06 11:56:07 -04:00
Forrest	095c6a8e4b	Merge pull request #50 from andrew-vant/rsprov Added salt-cloud support for Rackspace OpenStack servers.	2014-10-03 18:58:59 -07:00
Andrew Vant	970da0ef37	Added salt-cloud support for Rackspace OpenStack servers.	2014-10-03 21:23:50 -04:00
Forrest	4702e77756	Merge pull request #49 from johtso/issue-48 Avoid config key clashes	2014-10-03 11:46:55 -07:00
Johannes	791025e065	Avoid config key clashes Fixes #48	2014-10-03 09:43:59 +01:00
Nitin Madhok	e237a7dbbb	Merge pull request #46 from johtso/issue-45 Add missing .conf to config files	2014-10-01 13:39:15 -04:00
Johannes	247e6403a7	Add missing .conf to config files Closes #45	2014-10-01 18:37:09 +01:00
Nitin Madhok	1259f3eed8	Merge pull request #44 from jacksoncage/config-files #12 Moved master and minion config file to .d folder	2014-09-08 15:43:55 -04:00
Love Nyberg	75a1f888eb	#12 Moved master and minion config file to .d	2014-09-08 21:38:30 +02:00
Nitin Madhok	fba928096b	Merge pull request #43 from danielfrg/patch-1 Added rest_cherrypy section	2014-08-22 23:00:28 -05:00
Daniel Rodriguez	3bdf2789a1	Added rest_cherrypy section	2014-08-22 22:57:21 -05:00
Nitin Madhok	6a6b02b418	Update README.rst	2014-07-30 12:32:45 -04:00
Seth House	6c0cc53d5c	Merge pull request #42 from westurner/fix-nested-_roots Fix for nested [file\|pillar]_roots in minion tmpl (seeAlso: #37)	2014-07-23 11:45:29 -06:00
Joseph Hall	5bd3d62b42	Merge pull request #41 from jacksoncage/salt-cloud Added functionality to state for salt cloud and exampel for EC2 and GCE	2014-07-22 06:13:55 -06:00
Love Nyberg	6405354299	Fixed merge conflict and rearaged readme.	2014-07-22 10:24:09 +02:00
Love Nyberg	4226594c7c	Merge pull request #1 from saltstack-formulas/master Update from master	2014-07-22 10:20:46 +02: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
Forrest	760fa3ccdb	Merge pull request #40 from jacksoncage/salt-syndic Added functionality to state for salt syndic daemon	2014-07-21 14:15:37 -07:00
Love Nyberg	e798b46c8a	Added functionality to state for salt syndic deamon.	2014-07-20 17:05:53 +02:00
Love Nyberg	85ce73a839	Added functionality to state for salt cloud and exampel for EC2 and GCE	2014-07-20 16:59:38 +02:00
Erik Johnson	74acda8071	Merge pull request #38 from mogman1/master Fixed typo in autoreject_file setting	2014-06-05 16:36:02 -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
Seth House	23ef33b675	Merge pull request #37 from z-saltstack/fixed_file_roots Fixed file_roots config generation with several environment	2014-05-10 12:26:57 -06:00
Oleg Tsarev	94da2654e2	Fixed file_roots config generation with several environment	2014-05-10 15:21:37 +02:00
Forrest	077cfd6b71	Merge pull request #33 from raizyr/upstream log_granular_levels pillar data looks at the wrong thing	2014-03-29 16:19:22 -07:00
Chris McNabb	028412ee5e	use master when if in master	2014-03-28 15:13:33 -04:00
Seth House	56e679d863	Merge pull request #32 from johtso/patch-1 Update formula docs URL	2014-03-27 16:57:50 -06:00
Johannes	14055d2bb8	Update formula docs URL	2014-03-27 22:53:04 +00:00
Joseph Hall	664091a649	Merge pull request #31 from raizyr/add_amazon_os add Amazon os to package map	2014-03-19 12:48:23 -06:00
Chris McNabb	d0392b576e	add Amazon os	2014-03-19 14:06:27 -04:00
Forrest	d286e47a32	Merge pull request #25 from z-saltstack/master Actualized master and minion config files templates	2014-02-10 20:37:25 -07:00
Oleg Tsarev	18d7471198	Supported Arch Linux	2014-02-11 07:17:48 +04:00
Oleg Tsarev	e3b2ebeb06	Actualized master and minion config files templates	2014-02-11 07:04:03 +04:00
Joseph Hall	790065559c	Merge pull request #24 from gravyboat/master Fixed formatting in readme.	2014-02-08 05:38:10 -07:00
Forrest Alvarez	9e84f26fba	Fixed formatting in readme.	2014-02-08 05:47:47 +00:00
Seth House	54d2772a2e	Merge pull request #23 from gravyboat/master Updated readme to match standards.	2014-01-28 16:49:06 -08:00
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

1 2

99 Commits