Javier Bértoli 
							
						 
					 
					
						
						
						
						
							
						
						
							442806ab9e 
							
						 
					 
					
						
						
							
							Allow to specify different reactors for minions and masters  
						
						
						
						
					 
					
						2017-05-22 19:20:36 -03:00 
						 
				 
			
				
					
						
							
							
								Tobias Martin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							73906a03a5 
							
						 
					 
					
						
						
							
							added beacons configuration support  
						
						
						
						
					 
					
						2017-01-13 14:22:39 +01:00 
						 
				 
			
				
					
						
							
							
								Niels Abspoel 
							
						 
					 
					
						
						
						
						
							
						
						
							ddaa166de2 
							
						 
					 
					
						
						
							
							add engine and reactor config to salt minion configuration  
						
						
						
						
					 
					
						2016-09-30 21:27:20 +02:00 
						 
				 
			
				
					
						
							
							
								Jeremy T. Bouse 
							
						 
					 
					
						
						
						
						
							
						
						
							4283cba123 
							
						 
					 
					
						
						
							
							Add example for winrepo_provider  
						
						
						
						
					 
					
						2016-09-06 05:33:23 +00:00 
						 
				 
			
				
					
						
							
							
								Matthew Richardson 
							
						 
					 
					
						
						
						
						
							
						
						
							89ece150e6 
							
						 
					 
					
						
						
							
							Tidy up comments, add some docs/examples.  
						
						
						
						
					 
					
						2016-08-23 09:48:39 +01:00 
						 
				 
			
				
					
						
							
							
								Rene Jochum 
							
						 
					 
					
						
						
						
						
							
						
						
							f17b8f5424 
							
						 
					 
					
						
						
							
							Add optional method to remove /etc/salt/master.  
						
						... 
						
						
						
						Signed-off-by: Rene Jochum <rene@jochums.at> 
						
						
					 
					
						2016-07-15 15:13:21 +02:00 
						 
				 
			
				
					
						
							
							
								Rene Jochum 
							
						 
					 
					
						
						
						
						
							
						
						
							1b611c871e 
							
						 
					 
					
						
						
							
							Add optional method to remove /etc/salt/minion.  
						
						... 
						
						
						
						Signed-off-by: Rene Jochum <rene@jochums.at> 
						
						
					 
					
						2016-07-15 15:11:55 +02:00 
						 
				 
			
				
					
						
							
							
								Matthew X. Economou 
							
						 
					 
					
						
						
						
						
							
						
						
							d7be9aba9f 
							
						 
					 
					
						
						
							
							Document sample s3fs configuration  
						
						
						
						
					 
					
						2016-07-09 21:23:49 -04:00 
						 
				 
			
				
					
						
							
							
								risca 
							
						 
					 
					
						
						
						
						
							
						
						
							ca42d40ef9 
							
						 
					 
					
						
						
							
							added support for LXC profiles  
						
						
						
						
					 
					
						2016-06-07 19:46:08 +02:00 
						 
				 
			
				
					
						
							
							
								Christian McHugh 
							
						 
					 
					
						
						
						
						
							
						
						
							ac4ed62c03 
							
						 
					 
					
						
						
							
							Support engine configuration  
						
						
						
						
					 
					
						2016-05-27 23:27:55 -05:00 
						 
				 
			
				
					
						
							
							
								Brad Thurber 
							
						 
					 
					
						
						
						
						
							
						
						
							b9ae603fd7 
							
						 
					 
					
						
						
							
							Add support for master eauth LDAP config  
						
						
						
						
					 
					
						2016-05-26 10:52:10 -04:00 
						 
				 
			
				
					
						
							
							
								Brad Thurber 
							
						 
					 
					
						
						
						
						
							
						
						
							b3a3fa4d72 
							
						 
					 
					
						
						
							
							Ability to create non-templated cloud config files (maps/providers/profiles).  
						
						
						
						
					 
					
						2016-05-06 14:45:41 -04:00 
						 
				 
			
				
					
						
							
							
								Brad Thurber 
							
						 
					 
					
						
						
						
						
							
						
						
							c4ef48c5e8 
							
						 
					 
					
						
						
							
							add new gitfs functionality  
						
						
						
						
					 
					
						2016-04-19 12:51:17 -04:00 
						 
				 
			
				
					
						
							
							
								David Boucha 
							
						 
					 
					
						
						
						
						
							
						
						
							08501c9e18 
							
						 
					 
					
						
						
							
							Comment out second master config example  
						
						... 
						
						
						
						This second master config example was causing problems when vagrant
would use the default pillar.example 
						
						
					 
					
						2016-04-04 11:48:20 -06:00 
						 
				 
			
				
					
						
							
							
								Matthew X. Economou 
							
						 
					 
					
						
						
						
						
							
						
						
							e8021220b8 
							
						 
					 
					
						
						
							
							Revert PR  #200  
						
						... 
						
						
						
						This restores the original structure/behavior of the
`salt_formulas` Pillar key. 
						
						
					 
					
						2016-02-16 10:20:42 -05:00 
						 
				 
			
				
					
						
							
							
								Thomas Larsen 
							
						 
					 
					
						
						
						
						
							
						
						
							bbeacc4ace 
							
						 
					 
					
						
						
							
							Fixed typo in pillar.example  
						
						
						
						
					 
					
						2016-02-08 14:01:47 +00:00 
						 
				 
			
				
					
						
							
							
								Thomas Larsen 
							
						 
					 
					
						
						
						
						
							
						
						
							d1cbec3fe2 
							
						 
					 
					
						
						
							
							Added support for downloading formulas from multiple baseurls into the same environment.  
						
						
						
						
					 
					
						2016-02-08 13:45:09 +00:00 
						 
				 
			
				
					
						
							
							
								Brian Jackson 
							
						 
					 
					
						
						
						
						
							
						
						
							d216a3f651 
							
						 
					 
					
						
						
							
							Revert "Install cherrypy/tornado from pip only if use_pip is True."  
						
						... 
						
						
						
						This reverts commit 90282eff03847713936dd85045a3aa48c99e892c. 
						
						
					 
					
						2015-07-20 17:05:56 -05:00 
						 
				 
			
				
					
						
							
							
								René Jochum 
							
						 
					 
					
						
						
						
						
							
						
						
							90282eff03 
							
						 
					 
					
						
						
							
							Install cherrypy/tornado from pip only if use_pip is True.  
						
						... 
						
						
						
						Signed-off-by: René Jochum <rene@jochums.at> 
						
						
					 
					
						2015-07-13 22:08:20 +02:00 
						 
				 
			
				
					
						
							
							
								Edvinas Klovas 
							
						 
					 
					
						
						
						
						
							
						
						
							47b75d05c7 
							
						 
					 
					
						
						
							
							add pillar_roots for minion and master in pillar.example  
						
						
						
						
					 
					
						2015-05-14 13:37:36 +03:00 
						 
				 
			
				
					
						
							
							
								Andrew Vant 
							
						 
					 
					
						
						
						
						
							
						
						
							ba143c1810 
							
						 
					 
					
						
						
							
							Updated pillar.example with the correct defaults for template_sources.  
						
						
						
						
					 
					
						2015-04-13 16:07:03 -04:00 
						 
				 
			
				
					
						
							
							
								Andrew Vant 
							
						 
					 
					
						
						
						
						
							
						
						
							f3ed6e1828 
							
						 
					 
					
						
						
							
							cloud.providers.d can now be redirected.  
						
						... 
						
						
						
						This obsoletes the salt☁️ folders and salt☁️ providers pillar
entries. Provider keys have been moved to /etc/salt/pki/cloud. 
						
						
					 
					
						2015-04-03 19:30:26 -04:00 
						 
				 
			
				
					
						
							
							
								Andrew Vant 
							
						 
					 
					
						
						
						
						
							
						
						
							fb1d7e8d3b 
							
						 
					 
					
						
						
							
							Added pillar option to redirect profile and map folders.  
						
						
						
						
					 
					
						2015-04-03 17:33:25 -04:00 
						 
				 
			
				
					
						
							
							
								Andrew Vant 
							
						 
					 
					
						
						
						
						
							
						
						
							2d986eaa3f 
							
						 
					 
					
						
						
							
							Updated pillar.example with mine example.  
						
						
						
						
					 
					
						2015-04-03 15:35:14 -04:00 
						 
				 
			
				
					
						
							
							
								Brian Jackson 
							
						 
					 
					
						
						
						
						
							
						
						
							924c04c0d8 
							
						 
					 
					
						
						
							
							Add setting to not install packages  
						
						... 
						
						
						
						If you are installing Salt via git/pip, the formula will try to overwrite your
install with packaged versions. This setting makes it possible to avoid that. 
						
						
					 
					
						2015-03-24 12:08:08 -05:00 
						 
				 
			
				
					
						
							
							
								Brian Jackson 
							
						 
					 
					
						
						
						
						
							
						
						
							86c7b0a3e5 
							
						 
					 
					
						
						
							
							Add note about config option  
						
						... 
						
						
						
						Add note explaining what clean_config_d_dir does and why you shouldn't set it
to True. 
						
						
					 
					
						2015-03-24 11:01:58 -05:00 
						 
				 
			
				
					
						
							
							
								Brian Jackson 
							
						 
					 
					
						
						
						
						
							
						
						
							8ebb7f57df 
							
						 
					 
					
						
						
							
							Stop using clean: True on /etc/salt/{minion,master}.d  
						
						... 
						
						
						
						New versions of Salt put config files in /etc/salt/{minion,master}.d. We don't
want to erase them by using a clean: True on the file.recurse. This is a
backward incompatible change, but it's necessary to avoid deleting Salt config
files.
Resolves  #104  
						
						
					 
					
						2015-03-24 10:46:25 -05:00 
						 
				 
			
				
					
						
							
							
								Niels Abspoel 
							
						 
					 
					
						
						
						
						
							
						
						
							23fd8b64af 
							
						 
					 
					
						
						
							
							Fix   #39  multi master support to minion  
						
						... 
						
						
						
						This will fix  #39 
And it will be backwards compatible with the current pillar configuration. 
						
						
					 
					
						2015-02-06 22:27:55 +01:00 
						 
				 
			
				
					
						
							
							
								Niels Abspoel 
							
						 
					 
					
						
						
						
						
							
						
						
							7ddc1692ec 
							
						 
					 
					
						
						
							
							added rest_tornado to _defaults.conf  
						
						... 
						
						
						
						see pillar.example for configuration 
						
						
					 
					
						2015-02-06 18:46:32 +01:00 
						 
				 
			
				
					
						
							
							
								Niels Abspoel 
							
						 
					 
					
						
						
						
						
							
						
						
							d071713fa7 
							
						 
					 
					
						
						
							
							update pillar.example for new lookup  
						
						
						
						
					 
					
						2015-01-13 20:13:51 +01:00 
						 
				 
			
				
					
						
							
							
								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. 
						
						
					 
					
						2014-12-23 17:24:19 +01:00 
						 
				 
			
				
					
						
							
							
								Niels Abspoel 
							
						 
					 
					
						
						
						
						
							
						
						
							ef4bc1a25a 
							
						 
					 
					
						
						
							
							Added support for salt minion gitfs  
						
						... 
						
						
						
						Gitfs for the minion is possible with salt 2014.7
Updated config _defaults.conf and pillar with example
Tested it on Archlinux with salt-call --local state.highstate 
						
						
					 
					
						2014-12-08 22:17:07 +01:00 
						 
				 
			
				
					
						
							
							
								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. 
					
						2014-11-12 20:32:43 -08:00 
						 
				 
			
				
					
						
							
							
								Tim O'Guin 
							
						 
					 
					
						
						
						
						
							
						
						
							cde16097ed 
							
						 
					 
					
						
						
							
							add support for installing salt-ssh and managing the roster file, updated README and pillar.example  
						
						
						
						
					 
					
						2014-10-28 11:45:32 -05:00 
						 
				 
			
				
					
						
							
							
								Tim O'Guin 
							
						 
					 
					
						
						
						
						
							
						
						
							2852e7b897 
							
						 
					 
					
						
						
							
							add templated file for reactor configuration and update pillar.example.  
						
						
						
						
					 
					
						2014-10-24 14:48:56 -05:00 
						 
				 
			
				
					
						
							
							
								Ajna Cackovic 
							
						 
					 
					
						
						
						
						
							
						
						
							9dab2f9dab 
							
						 
					 
					
						
						
							
							Update pillar.example to show gitfs_remotes option usage  
						
						
						
						
					 
					
						2014-10-23 18:33:16 -07:00 
						 
				 
			
				
					
						
							
							
								Seth House 
							
						 
					 
					
						
						
						
						
							
						
						
							1682df8592 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/pr/47'  
						
						... 
						
						
						
						Conflicts:
	salt/master.sls
	salt/minion.sls 
						
						
					 
					
						2014-10-09 16:39:07 -06:00 
						 
				 
			
				
					
						
							
							
								Andrew Vant 
							
						 
					 
					
						
						
						
						
							
						
						
							970da0ef37 
							
						 
					 
					
						
						
							
							Added salt-cloud support for Rackspace OpenStack servers.  
						
						
						
						
					 
					
						2014-10-03 21:23:50 -04:00 
						 
				 
			
				
					
						
							
							
								Kevin Bowling 
							
						 
					 
					
						
						
						
						
							
						
						
							8c10d8c776 
							
						 
					 
					
						
						
							
							Pillar example whitespace  
						
						
						
						
					 
					
						2014-10-01 23:44:48 -07: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 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							9404ebf915 
							
						 
					 
					
						
						
							
							Added module_config section to minion template  
						
						
						
						
					 
					
						2013-09-03 09:45:24 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							71418cd1d7 
							
						 
					 
					
						
						
							
							pillar example fix  
						
						
						
						
					 
					
						2013-08-13 16:40:48 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							8060db1c7b 
							
						 
					 
					
						
						
							
							used saltstack formulas repo instead of my own  
						
						
						
						
					 
					
						2013-08-12 17:37:38 -05:00 
						 
				 
			
				
					
						
							
							
								Kenneth Wilke 
							
						 
					 
					
						
						
						
						
							
						
						
							48d89a5485 
							
						 
					 
					
						
						
							
							added pillar example  
						
						
						
						
					 
					
						2013-08-12 17:35:25 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Grosser 
							
						 
					 
					
						
						
						
						
							
						
						
							c431ed9119 
							
						 
					 
					
						
						
							
							Add pillar.example  
						
						
						
						
					 
					
						2013-07-27 23:33:33 +02:00