valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,053 Commits 24 Branches 182 Tags 341 MiB
4d181ea523
Commit Graph

581 Commits

Author SHA1 Message Date
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Jacob Hammons
3f3db4bd8e Additions for #24042 2015-07-30 15:43:21 -06:00
Jacob Hammons
db2129b199 Minor doc bug fixes 
Refs #24042
Refs #25650
Refs #21296
Refs #23788
 2015-07-30 14:39:15 -06:00
Justin Findlay
d73964ea3c add console_log_fmt color documentation 2015-07-28 16:16:29 -06:00
Mike Place
0dc28ad3e4 Return to str for master_type for 2015.5 2015-07-24 11:55:56 -06:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Stephen D. Spencer
f6dbeaf0e4 replace bad value for master_type in example minion config 
At some point, `standard` became an invalid argument for the master_type
minion config bit.  The bootstrap script, perhaps naively, uses this
file to lay down a minion config for a newly bootstrapped system.

bootstrap.sh should probably just drop an empty /etc/salt/minion rather
than trying to set every available minion opt.

In lieu of wading into bootstrap*, this allows Minion.eval_master() to
not soil itself and continue on its merry way when not operating in one
of its more advanced contexts.

* mad props to the creators/maintainers of the bootstrap script.  BASH makes
  me want to cut myself, so I appreciate complex scripts that are so
  very functional that I don't have to be responsible for
 2015-06-30 13:50:41 -05:00
Justin Findlay
e4a40b7bd8 comment whitespace in minion config 2015-06-30 03:10:56 -06:00
Justin Findlay
44cb167744 adding sudo_user minion config docs 2015-06-30 03:10:56 -06:00
Colton Myers
acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/utils/cloud.py
    salt/utils/job.py
 2015-06-24 11:44:04 -06:00
C. R. Oldham
f0c9204d8b Add references to failover parameters in conf 2015-06-23 11:07:45 -06:00
Colton Myers
2ae0d7d302 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/win_file.py
 2015-06-16 15:13:53 -06:00
Mike Place
b7bb7eaeb2 Note about minimum worker_threads 2015-06-15 11:43:14 -06:00
Z. Liu
55db1bf8b5 sate_output_profile default to True 2015-05-27 11:20:15 -06:00
Z. Liu
991922703b fix type: statei -> state 2015-05-27 11:20:14 -06:00
Z. Liu
0549ca6266 add 'state_output_profile' option for profile output 2015-05-27 11:20:14 -06:00
Colton Myers
ece63c36a3 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/modules/win_groupadd.py
 2015-05-06 15:49:50 -06:00
Colton Myers
2981aed48e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-05-05 16:49:31 -06:00
Colton Myers
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/client/ssh/__init__.py
    salt/client/ssh/wrapper/__init__.py
    salt/config.py
    salt/modules/file.py
    salt/runners/lxc.py
 2015-05-05 16:26:39 -06:00
Colton Myers
87fc3161f9 Add Salt-SSH section to master config template 2015-05-04 15:05:12 -06:00
Steve Weber
36b1c87dd2 include module_dirs 
include module_dirs because its more flexible than extension_modules.
 2015-05-04 12:53:50 -04:00
Mike Place
3bc74501e4 Document many core opts 
Although these are documented in other places, we need somewhere that we
can store more in-depth, interface-specific information about various options.

This way, we can make implementation-specific comments which would not be approrpiate
for user configuration files.
 2015-04-03 17:17:06 -06:00
Nicole Thomas
44c7eb4d4b Merge pull request #22169 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-03-31 09:21:36 -06:00
Colton Myers
124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/index.rst
    doc/topics/eauth/index.rst
    salt/beacons/__init__.py
    salt/beacons/service.py
    salt/loader.py
    salt/minion.py
    salt/output/nested.py
 2015-03-30 15:10:17 -06:00
Justin Findlay
294dfe2d94 clarify and expand console log colors help 2015-03-26 23:21:30 -06:00
Colton Myers
7ba2404cc9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    conf/master
    conf/minion
    doc/ref/configuration/master.rst
    salt/loader.py
    salt/minion.py
    salt/modules/ssh.py
    salt/output/nested.py
    salt/utils/network.py
 2015-03-25 09:28:04 -06:00
rallytime
609dcdbac1 Add default for pillar_source_merging_strategy in conf/master file 
Fixes #21511
 2015-03-24 14:53:18 -06:00
C. R. Oldham
a35f38a71e Clarify how defaults are indicated in the config files. 2015-03-24 12:27:51 -06:00
C. R. Oldham
5dbb0d433d Clarify how defaults are indicated in the config files. 2015-03-24 12:10:01 -06:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
 2015-03-09 12:52:14 -06:00
s8weber
ad869c74b1 add pillar_safe_render_error config 
allow a salt admin to config if the detailed render error of pillars
can be passed to the minion.
 2015-03-04 10:22:29 -05:00
Damian Myerscough
822c5ea626 The -F options shows all key fingerprints, -f allows you to filter out a specific key 2015-03-01 14:46:45 -08:00
Mike Place
9c225cb84d ZeroMQ socket monitoring 
This allows a user to log connection events from a ZeroMQ socket to better diagnose connectivity issues. Requires ZeroMQ 4.x.

Conflicts:
	salt/minion.py
 2015-02-19 10:18:27 -07:00
Mike Place
ec60d03e54 ZeroMQ socket monitoring 
This allows a user to log connection events from a ZeroMQ socket to better diagnose connectivity issues. Requires ZeroMQ 4.x.
 2015-02-17 15:12:13 -07:00
Mike Place
c96b4725ae Merge pull request #20465 from cachedout/safemode_config 
Fix mismatched config value for auth_safemode
 2015-02-06 08:51:40 -07:00
Mike Place
f9cb6cdeeb Fix mismatched config value for auth_safemode 
The actual default is false.

Closes #19945
 2015-02-06 09:19:10 -07:00
rallytime
9898fcf613 Merge branch '2015.2' into 'develop' 
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
 2015-01-29 17:24:04 -07:00
Kevin Bowling
23155964f5 Remove unused restart_on_error config 2015-01-27 19:24:29 -07:00
Z. Liu
d46b6b6490 sate_output_profile default to True 2015-01-03 01:36:21 +08:00
Z. Liu
3fce994d30 fix type: statei -> state 2015-01-03 01:26:12 +08:00
Z. Liu
8217f5fa66 add 'state_output_profile' option for profile output 2015-01-02 22:56:39 +08:00
Justin Findlay
e8d4882c0a remove misleading unicode message 2014-12-27 17:38:05 -07:00
Justin Findlay
2d93867c3e add color to console logger 2014-12-27 13:36:57 -07:00
Thomas S Hatch
1dcc05b049 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/yumpkg.py
 2014-12-17 15:00:26 -07:00
Seth House
7ce1becf34 Added note about using log_level_logfile with log_granular_levels 2014-12-16 18:18:21 -07:00
Seth House
90edd2185b Removed trailing comma from log_granular_levels example; is invalid YAML 
Thanks to F. Langelier for the report.
 2014-12-16 18:13:07 -07:00
Thomas S Hatch
fc8535e09f Merge pull request #18702 from wolfpackmars2/patch-1 
Propose update to master config file
 2014-12-04 16:41:43 -07:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
 2014-12-04 11:11:11 -07:00
Joseph Hall
85bdf64ecb Merge pull request #18677 from QthCN/develop 
Add Returner Setting section for returner's config
 2014-12-04 05:49:44 -07:00
Steve Groesz
b65e12e790 Propose update to master config file 
Per the documentation: http://docs.saltstack.com/en/latest/ref/configuration/master.html#include-configuration  the include directive is unset by default.  As documented at the top of the master config file: "Values that are commented out but have no space after the comment are defaults that need not be set in the config. If there is a space after the comment that the value is presented as an example and is not the default."  Therefore, I propose adding a space after the comment to clarify that this is an example directive and not the default.
 2014-12-03 21:12:13 -06:00
QthCN
1f6bb0a012 Add Returner Setting section for returner's config 2014-12-04 00:12:37 +08:00
Seth House
aa964e5d3c Added state_aggregate placeholders to the master/minion conf files 2014-12-02 18:33:10 -05:00
Mike Place
b0a3d2b87b Event return filtering 2014-12-01 13:05:21 -07:00
Mike Place
8877ba7d78 Ability to queue event returns 2014-12-01 11:46:27 -07:00
Mike Place
5594be2708 Now fires events to specified returner 2014-11-26 16:31:44 -07:00
Mike Place
36017c0911 Configuration gate 2014-11-26 15:37:01 -07:00
Damian Myerscough
3ed419288a sudo_client acl directive 2014-11-17 14:13:06 -08:00
Tehmasp Chaudhri
cd7d739b02 Typo fix and formatting 2014-11-13 13:59:23 -07:00
Thomas Jackson
1acf7c0184 Spelling 2014-10-28 08:13:02 -07:00
Mike Place
5ec3d05bc7 Add master_alive_interval to stock minion config 2014-10-23 11:47:00 -06:00
David Boucha
6406078240 pillar_opts defaults to False in develop now 2014-10-17 10:18:59 -06:00
Mike Place
a4c524176f Flag to preserve minion cache on key delete 
Refs #15673
 2014-10-03 13:29:41 -06:00
Mike Place
5f2103903d Flag to preserve minion cache on key delete 
Refs #15673
 2014-10-03 11:43:33 -06:00
Pedro Algarvio
7c3a1375c1 Merge pull request #16203 from techhat/microinstance 
Get rid of Micro Instance examples
 2014-09-27 20:59:06 +01:00
Joseph Hall
9d6e4ff168 Get rid of Micro Instance examples 2014-09-27 11:09:08 -06:00
Colton Myers
11ddb3874b Merge branch '2014.7' into develop 
Conflicts:
	conf/master
	conf/minion
 2014-09-26 17:46:10 -06:00
rallytime
4402fd80fb Clean up formatting of minion stock conf file 2014-09-26 15:38:49 -06:00
rallytime
33369370d9 Clean up formatting of master stock conf file 2014-09-26 15:15:40 -06:00
Colton Myers
99e97320e1 Merge branch '2014.7' into develop 
Conflicts:
	doc/ref/configuration/minion.rst
	doc/ref/states/requisites.rst
	doc/topics/troubleshooting/master.rst
	doc/topics/tutorials/index.rst
	doc/topics/tutorials/intro_scale.rst
	salt/config.py
	salt/key.py
	salt/master.py
	salt/minion.py
	salt/modules/file.py
	salt/modules/hashutil.py
	salt/modules/lxc.py
	salt/modules/oracle.py
	salt/modules/tls.py
	salt/modules/win_update.py
	salt/pillar/pepa.py
	salt/pillar/s3.py
	salt/states/augeas.py
	salt/states/win_update.py
	salt/tops/ext_nodes.py
	salt/utils/master.py
 2014-09-22 14:22:54 -06:00
Mike Place
53445d607b Copy con_cache doc into master conf. 
Refs PR #15918
 2014-09-18 09:23:27 -06:00
Mike Place
50579b31cd Set default to false 2014-09-17 14:38:42 -06:00
Mike Place
0a4b370bc7 Add note about large install to config file 2014-09-15 12:42:59 -06:00
Mike Place
305956c539 Fire an event on AES key rotate. 
Also setup a config file option for ping-on-rotate.
 2014-09-15 11:39:58 -06:00
Thomas S Hatch
39b107a283 Merge pull request #14820 from steverweber/add_conf_help 
show_timeouts, new default
 2014-09-02 12:13:31 -06:00
Colton Myers
36ef47e7a2 Merge branch '2014.7' into develop 
Conflicts:
	conf/minion
	salt/modules/mine.py
 2014-09-02 10:43:31 -06:00
Jille Timmermans
4064a8cf4c Fix some documentation inconsistencies 2014-09-02 11:38:23 +02:00
Jille Timmermans
6de9cb9b3c Small fixes in the comments in conf/minion 2014-09-01 15:18:46 +02:00
Scott Coil
6770ce314e add ability to target pillar from ext pillar 2014-08-31 16:46:22 -05:00
Seth House
4abc45397d Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-21 13:23:52 -06:00
Mike Place
94543fe68d Document seco range 
Per request in #15093
 2014-08-20 11:54:29 -06:00
steve
d13c7275a7 show_timeouts, new default 2014-08-14 13:10:52 -04:00
Seth House
b5bf67fdd1 Merge branch 'copyediting' of https://github.com/hulu/salt into develop 
Conflicts:
	salt/states/win_update.py
 2014-08-11 18:23:44 -04:00
Chris Rebert
fede2f6f9b fix typo: Debain => Debian 2014-08-11 10:58:55 -07:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian 
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
 2014-08-11 10:46:43 -07:00
Joseph Hall
a6476e0361 Add more URL clarifications 2014-08-07 16:25:14 -06:00
Thomas S Hatch
f76596f403 Merge pull request #14819 from steverweber/fix_more_tries 
auth_tries should be repeated
 2014-08-07 12:27:05 -06:00
steve
95862351d0 auth_tries should be repeated 2014-08-07 09:43:06 -04:00
steve
bc3ade860c catch exceptions and fix some vars 2014-08-05 22:39:57 -04:00
steverweber
bf8f936fa4 fix issues with keepalive minion 2014-07-25 15:13:05 -04:00
Thomas S Hatch
bb178a9a0d Revert "change minion auto restart to multiprocessing mode" 2014-07-23 13:46:23 -06:00
steverweber
ea1fc7295b change minion auto restart logic into multiprocessing to fix mem leaks 2014-07-23 11:28:27 -04:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
rallytime
f0d9db2497 Removed the term "Hydrogen" from versionadded notation 2014-07-01 15:01:12 -06:00
Germán Jaber
a801446af8 Added state_output_diff to the minion config file 2014-06-26 23:31:10 -04:30
Mathieu Le Marec - Pasquet
da758409d4 make color stripping configurable 2014-06-20 09:53:28 +02:00
Cowyn Li
9436dbd84c Provide a reasonable sample path for autoreject_file without confusion 2014-06-17 19:01:31 +08:00
David Boucha
83aeb96731 Fix metric math example 2014-05-30 11:15:24 -06:00
Jason Mehring
b462864787 Added a _utils sync mechanism for distributing utility source files to minions (#12712) 2014-05-16 14:59:50 -04:00
steverweber
84bfe9ce18 auto accept keys in minions_autosign 
Accept keyids if a file with the same name is found in minions_autosign.
Also option to check the datestamp of the file and only accept if within timeout.
 2014-05-12 19:56:39 -04:00
Niels Abspoel
17c05379e9 added vsphere.conf example to cloud.providers.d 2014-05-02 18:08:19 +02:00
Thomas S Hatch
65b6d0e005 Merge branch 'fix_ddns2' of git://github.com/steverweber/salt into steverweber-fix_ddns2 
Conflicts:
	salt/config.py
 2014-04-30 13:00:26 -06:00
Mike Place
79a758e3aa Raise max to 1 MiB. 
Otherwise, the loader will tank.
 2014-04-29 17:09:14 -06:00
Mike Place
0b1da0dd84 Use KiB 2014-04-29 17:09:14 -06:00
Mike Place
97598126a3 Max message size for event bus. 
Closes #11372
 2014-04-29 17:09:14 -06:00
s8weber
55e38a9319 Minion restart if master is not responding 2014-04-28 12:26:54 -04:00
Mike Place
756b0e386b Remove hard-coded MD5 wherever possible. 
Doing so helps Salt to achieve FIPS compliance. Closes #11486 and #7318.
 2014-04-07 14:14:19 -06:00
Tom Atkinson
72e76efeb5 Document the changes setting for state_output in default master conf file 2014-04-07 17:26:07 +02:00
Chris Cormier
da2655111d Add minion auth retry on rejection 2014-03-24 14:16:31 -04:00
Pedro Algarvio
9ec00d2834 Fix wrong permissions 2014-03-23 18:22:35 +00:00
Frank Klaassen
3d69b94124 Fixes after feedback: 
- Remove empty comment (was actually a divider just to separate the internal functions)
- Comment out config by default
- Removed unused imports urllib, urllib2
- Removed unused dependency (and import) of json
 2014-03-23 13:28:24 +01:00
Frank Klaassen
7a82700098 Chmod files back to original 2014-03-22 17:47:54 +01:00
Frank Klaassen
9da568d7f9 Support for Proxmox in Salt-Cloud 2014-03-22 17:44:59 +01:00
Jens Rantil
347c0ae5f1 fix(config/master): typo 2014-03-14 11:16:36 +01:00
Seth House
a06ccfef2f Added docs for the extension_modules setting 
Refs #11030
 2014-03-07 15:13:41 -08:00
Colton Myers
cd9480c261 Clarify the actions salt will take when run as non-root 
Ref #10433

Also fix a dangling preposition
 2014-02-14 14:52:19 -07:00
Jon Henry
cf91e9638d Add random_master minion config option, which will randomize the list of available masters if set to True 2014-02-06 10:17:35 -07:00
Jon Henry
478747b7d5 Document new auth_timeout option in sample minion config 2014-02-05 10:36:17 -07:00
Erik Johnson
fa468c3797 Fix typo in master config file 
Resolves #10144.
 2014-02-03 14:12:21 -06:00
Mike Place
a4c78e5866 Grains caching layer 
* Creates a new flag for salt-call called '--skip-grains' that will completely bypass the grains loader. (Mostly for testing. Will break many modules in practice!)

* Creates a new flag for salt-call called '--refresh-grains-cache'. This forces a refresh of the grains cache on a minion.

* Adds a new minion config option called 'grains_cache'. Defaults to False.

* Adds a new minion config options called 'grains_cache_expiration'. Specifies the number of seconds allowable for before a minion grain cache is declared to be stale.

* Correct a potential syntax error in the minion config variable, 'grains_refresh_every'.

* Modify the 'apt' module so that it does not stack-trace in virtual() if grains aren't loaded.

* A new caching layer for the grains loader that can write to and read from a msgpack'd serialized data file containing grains that is stored in the minion cache.
 2014-01-23 15:09:22 -07:00
Thomas S Hatch
6a922d30eb Use correct yaml in examples 2014-01-12 01:10:17 -07:00
Thomas S Hatch
962fc36936 autoreject is the config value 2014-01-11 13:26:33 -07:00
Erik Johnson
d5440647d4 Add gitfs_provider to master config file template 
Also moved a paragraph that seemed to be out of place
 2014-01-03 20:57:25 -06:00
Thomas S Hatch
b3b6c0bcee Merge pull request #8734 from terminalmage/autoreject_file 
add an autoreject_file parameter to the master config file
 2013-12-30 09:24:03 -08:00
C. R. Oldham
d9d359ba05 Enable cryptographic signing of messages published from the master. 2013-12-11 13:47:47 -07:00
Thomas S Hatch
4bffa13abf Merge pull request #9108 from pakdel/file_recv_max_size 
Added an option to limit maximum size of a file that can be pushed to master by files_recv
 2013-12-09 10:34:06 -08:00
Amir Pakdel
49141cf042 file_recv_max_size config is specified in megabyte 2013-12-09 10:50:52 -05:00
Thomas S Hatch
fa1c9c4401 Disable fileserver events by default 
@jacksontj, this turns off these event by default and you will
need to set this flag in your config in the future
 2013-12-08 22:46:36 -07:00
Amir Pakdel
c934a9bd36 Added an option to limit max size in files_recv 
The default is set to 100MB, which means pushing
larger files will stop when reaches this limit.
This limit can be adjusted by file_recv_max_size
option in the master's config file.
 2013-12-08 15:01:20 -05:00
Jorge-Rodriguez
25573412d4 Added ssl verify flag to the gitfs backend. 2013-12-03 09:54:47 +02:00
Jorge-Rodriguez
ddf4c6dbe2 Added SSL verify flag for pillar git backend, in case getting around 
self-signed certificates is needed.
 2013-12-02 10:40:11 +02:00
Erik Johnson
e9eae00028 Add autoreject_file to master config template 2013-11-21 17:12:10 -06:00
Joseph Hall
21a29a4bec Fixing up cloud.profiles with more valid configs 2013-11-20 08:51:51 -07:00
Joseph Hall
827ba113ef Fixing up salt-cloud sample configs 2013-11-20 08:48:01 -07:00
C. R. Oldham
236a1656d3 Implement #8333 2013-11-08 13:29:47 -07:00
Mike Place
ad98ed11ad A minion with locally defined fileroots may also deep-recurse. Allow the minion to limit this behavior through a configuration option. 2013-11-01 09:19:30 -06:00
Mike Place
459feb70f3 Provide a configuration switch to enable limited directory traversal. 2013-10-31 17:07:02 -06:00
Mike Place
5aa4691a09 New configuration option to disable lspci queries for GPU data on master. 2013-10-22 14:36:13 -06:00
Thomas S Hatch
e49504e35d hard default grains refresh to be disabled 2013-10-22 07:22:45 -06:00
Mike Place
2209f421ee Re-write to use Scheduler instead of threads. 2013-10-18 15:53:27 -06:00
Mike Place
b5c6ead7a6 First pass at an automated check in the minion tune-in loop, using a threaded approach to periodically refresh the master if the grains on a minion have changed. 2013-10-18 12:56:54 -06:00
Thomas S Hatch
2924404f0a Merge pull request #7477 from jacksontj/develop 
Initial addition of minion module memory limit
 2013-10-07 14:07:00 -07:00
Joe Healy
1fa680d25c Added default config for salt-ssh 2013-10-01 23:54:51 +10:00
Thomas Jackson
67176595b6 Adding docs for modules_max_memory 2013-09-26 16:32:33 -07:00
Mickey Malone
2675f34079 Added more symlink funtionality 
Cleaned up some of the comments/doc language
 2013-09-25 22:21:27 -05:00
Mickey Malone
84fee92e72 Merge remote-tracking branch 'upstream/develop' into develop 2013-09-24 21:37:47 -05:00
Mickey Malone
1be07f2ff0 Added some more documentation to fileserver_followsymlinks 2013-09-24 21:36:16 -05:00
mlister2006
2ecaddb484 Adding master side acl support for mine.get 2013-09-23 12:00:19 -04:00
Mickey Malone
105806ead3 Added ignore symlink option. Cleaned up roots. 2013-09-20 20:25:48 -05:00
Mickey Malone
237adbf3e6 Made roots fileserver backend symlink traversal configureable 2013-09-20 12:47:05 -05:00
Joe Healy
aece0976a6 Fixed pedantic spelling errors picked up by lintian 
joe@unstable-builder:~/salt_017rc/salt$ lintian -I ../*.deb
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz softwares software - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz specifed specified - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Targetting Targeting - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz targetted targeted - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Dependant Dependent - done
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57301 /var/named/ - not done - example
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57320 /var/named/ - not done - example
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57339 /var/named/ - not done - example
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz recieve receive - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz allows to allows one to - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz allows to allows one to - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz dont don't - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz succesfully successfully - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz softwares software - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz These package This package - not done - legitimate
 2013-09-20 22:01:20 +10:00
Erik Johnson
46d68c8669 Fix inconsistent indentation in config file templates 
In the config file templates, some parameters are commented out with a
pound sign, and others are commented out using a pound sign and a space.
This has led to some confusion when people uncomment some params to use
them and then there are errors when PyYAML tries to render the data.

This commit makes the commenting of config parameters uniform, using
just a pound sign with no extra space.
 2013-09-13 16:32:21 -05:00
micahhausler
b27bb8b1c1 Fixed #6803 -- Added example to ignore serving vim swapfiles 2013-09-06 15:01:23 -04:00
Jason Sommer
201b4f8776 Added gitfs_root option 2013-08-17 20:14:57 -05:00
Erik Johnson
b9ae4a636e Add file_recv option to config file template 2013-08-08 15:10:11 -05:00
Erik Johnson
15640a70c6 Grammar cleanup 2013-08-03 18:51:37 -05:00
Erik Johnson
70e236d028 Docmentation tweaks in advance of 0.16.2 release 2013-07-31 20:43:37 -05:00
Erik Johnson
fae7a1576c Fix warning during minion auth due to invalid config param type 2013-07-27 19:53:15 -05:00
Thomas L. Kula
54a0746b4e Backoff when minion fails to connect 
NOTE: This is a potential change --- I haven't actually gotten a
test environment to try this out.

This adds a configuration option to the minion,
`acceptance_wait_time_max', that if set changes the acceptance
wait loop to add `acceptance_wait_time' seconds to the wait between
each iteration, up to this maximum value.

POTENTIAL FIX: Issue #5813
 2013-07-27 16:51:38 -04:00
Erik Johnson
17ebff3b9d Fix indentation in the minion config template 
The example for the 'backup' param in the minion config file template is
indented one level further than it should. This commit fixes that.
 2013-07-27 00:28:15 -05:00
Volker Schwicking
cf77eca666 added reconnect dealy for the minion zmq-pull socket 2013-07-17 18:46:43 +02:00
Mathieu Le Marec - Pasquet
cff1fa6f53 fix/feat: let the syndic be way more configurable 
- Fix micmac between configs
- Add options to configure pidfile, logfile, masterofmaster port

This fixes #6024.
 2013-07-15 20:30:26 +00:00
Volker Schwicking
9c82c0e401 add new setting 'random_reauth_delay' which delays the re-auth attempts of a minion by random seconds to receive a changed master-key. 2013-07-08 16:58:29 +02:00
Volker Schwicking
8fbbede033 add new setting 'random_reauth_delay' which delays the re-auth attempts of a minion by random seconds to receive a changed master-key. 2013-07-08 16:47:13 +02:00
Daniel Naegele
daa4007d78 quickfix for IPv6, added basic documentation to the default configs 2013-06-18 02:04:17 +02:00
Chris Rebert
e89cbf4447 capitalize Linux in comments/docs 2013-05-15 19:21:50 -07:00
Colton Myers
cbd6492950 Add docs for file:// in gitfs 2013-05-07 11:21:26 -06:00
Colton Myers
9a2c99419d Add docs for state_output: 'mixed' 2013-05-06 15:40:13 -06:00
Colton Myers
9bb9be8f46 Remove rogue tabs and trailing whitespace in conf/master 2013-02-25 11:46:27 -07:00
Colton Myers
03921b3f2e Remove rogue tabs and trailing whitespace in conf/minion 2013-02-25 11:45:42 -07:00
Sean Channel
13c6569269 local repo git example 2013-02-12 10:12:25 -08:00
John Albietz
cbca0ac09d updated formatting for consistency. typos fixed. 
tried to remove some redundant language also.
 2013-02-11 18:40:00 -08:00
David Boucha
46fcbd7100 Add comment about client_acl_blacklist 2013-02-11 16:41:27 -07:00
Sean Channel
883600fc2e comment out for issue #3661 2013-02-11 14:46:54 -08:00
Thomas Jackson
8cd53c3ecc Initial add of client_acl_blacklist (#3450) 
This feature allows you to blacklist users (regex) and modules (regex)
 2013-02-07 10:49:31 -08:00
Thomas S Hatch
7b1d9d9330 Add loop_interval to default master config 2013-01-14 01:21:28 -07:00
Thomas S Hatch
f7189d9909 Add loop_interval to default minion config 2013-01-14 01:18:40 -07:00
Thomas S Hatch
409221037c Add color optiuon to default minion config 2013-01-10 18:16:24 -07:00
Thomas S Hatch
4e0f2f2110 Add color value to the default config 2013-01-10 18:15:05 -07:00
Thomas S Hatch
3c119f48da Add output tot he default minion config 2013-01-10 18:13:31 -07:00
Thomas S Hatch
eb582dee60 Add output option to default master config 2013-01-10 18:12:11 -07:00
Sean Channel
c363fbe690 localhost -> loghost 2013-01-10 16:59:24 -08:00
Sean Channel
6b35ca83d0 wordsmith logging options 2013-01-10 16:51:44 -08:00
Pedro Algarvio
ca0c9b184d Include remote logging comments in configuration files. Refs #3061. 2013-01-07 17:56:37 +00:00
Thomas S Hatch
699e83e240 update the master config with fileserver_backend data 2013-01-01 14:56:26 -07:00
David Boucha
2f05c94d8a Add Windows Repo configs to config template files 2012-12-31 11:35:31 -07:00
Thomas S Hatch
fa06e44d4f Add fileserver_backend option to default config 2012-12-27 14:21:56 -07:00
Seth House
0fce26db87 Bumped default token lifetime from 12 minutes to 12 hours; added config 2012-12-27 12:59:37 -07:00
Erik Johnson
6739eca926 cleanup for 8bb8143 2012-12-27 11:29:46 -06:00
D Tucny
d63b0466cf correct documentation in sample config for TCP keepalive option 2012-12-24 10:57:02 +08:00
D Tucny
6ad642a748 Add configurable tcp keepalive support enabled by default 2012-12-24 10:45:02 +08:00
Tris Forster
3b0069db39 Updated config comments to reflect 8d723cd (pidfile / root_dir) 2012-12-22 17:03:19 +11:00
Pedro Algarvio
ba09404238 Allow different date formats for the console and the logfile to be configured. 2012-12-18 13:35:13 +00:00
Bernd Nigmann
ae600fa801 Implemented the file_ignore_regex and file_ignore_glob feature 2012-12-05 13:58:43 -05:00
Sean Channel
0d7732930a drop .template from cfg file names 2012-12-03 23:42:18 -08:00
Thomas S Hatch
25a23a77c1 Merge pull request #2778 from s0undt3ch/issues/2763 
Support syslog logging Fixes #2763
 2012-12-03 04:21:10 -08:00
Pedro Algarvio
6413c5d8e3 Add the syslog logging feature documentation to the template configuration files. Refs #2763. 2012-12-03 12:13:32 +00:00
Thomas S Hatch
530e67e74a remove sub_timout from the minon default config 2012-12-03 05:09:35 -07:00
Henrik Holmboe
acc49904cd Remove references to pub_refresh. 
The configuration option was removed in 0.10.5.
 2012-11-29 16:44:49 +01:00
David Boucha
a4aa4d8b3e Update minion conf template with new paths 2012-11-20 12:35:17 -07:00
David Boucha
e9d48e8398 Update master template with new paths 2012-11-20 12:35:17 -07:00
David Boucha
d4f7f5cac5 Add option to have minion retry dns 
If name resolution fails when the minion starts, allow the minion
to retry dns resolution after a configurable number of seconds.
Defaults to 30 seconds.

Add retry_dns option to minion config.
 2012-11-09 21:10:59 -07:00
Thomas S Hatch
0a1839ff43 Clean up the master config to conform to conventions 2012-11-07 11:48:23 -07:00
Dave Boucha
1cc9acc7fc Clarify diff between console and log file settings 
log_level refers to console logging level
log_level_logfile refers to log file logging level

These are configured separately.
 2012-10-23 10:06:12 -06:00
G. Clifford Williams
607dab0e71 Merge branch 'develop' of https://github.com/saltstack/salt into develop 
resolution of documentation merge with upstream develop branch
 2012-10-20 13:13:59 -05:00
G. Clifford Williams
d399da4259 Merge branch 'master' of https://github.com/saltstack/salt into develop 
Conflicts:
	doc/ref/renderers/all/index.rst
 2012-10-20 11:54:50 -05:00
G. Clifford Williams
3c742d6d83 added wempy info to minion.template 2012-10-16 11:11:37 -05:00
Thomas S Hatch
2ed56e6ac3 update pub_refresh to be set to False 2012-10-11 22:37:44 -06:00
Sean Channel
94451b746b delete older dup of state_verbose 
state_verbose appears twice in this file. this change deletes the older one in favor of the more recent addition lower down.
 2012-10-11 14:07:05 -07:00
Thomas S Hatch
418e5af7ce Add pillar_opts option. This is turned on by default! 
This adds the master config file options to the pillar, this means
that all of the config data on the master config is available via
pillar now. Fix #1886
 2012-10-10 23:53:01 -06:00
Sean Channel
cc693df28a add link to range doc 
I kept wondering what this was and if it was supposed to be there
 2012-10-05 08:22:20 -07:00
Thomas S Hatch
3430b4ede2 Fix external_auth to reflect current capabilities 2012-10-04 00:11:16 -06:00
Thomas S Hatch
38dca085a8 Initial conf for external auth (no worky yet) 2012-10-02 15:03:30 -06:00
Thomas S Hatch
9d14264dee update master template with ext_nodes option 2012-09-30 23:55:49 -06:00
Thomas S Hatch
1a241d326b Add master_tops option to the master config 2012-09-30 23:18:05 -06:00
Thomas S Hatch
818c2bafaa Fix #2125 2012-09-27 19:28:08 -06:00
Thomas S Hatch
52416bf0bd Some minor changes to the minion conf template 2012-09-24 22:29:20 -06:00
Thomas S Hatch
e76914c176 extention modules is internal, my bad 2012-09-24 21:16:50 -06:00
Thomas S Hatch
b80b7cc395 Clean up master config template a little 
I got rid of the cluster stuff, since it does not work and needs
to be pulled out of the core anyway
 2012-09-24 11:43:33 -06:00
Sean Channel
e90c3d36a4 extension_modules added in root_dir comments 
I still don't know what it's for, but I know where it goes! :)
 2012-09-23 23:38:25 -07:00
Sean Channel
9fbd83752a tcp_pub_port, tcp_pull_port 2012-09-23 22:55:28 -07:00
Sean Channel
b6b1dac3e1 added: 
sock_dir
 verify_env
 extension_modules
 master_finger
 failhard
 startup_states
 sls_list
 top_file
 ipc_mode
 grains
 timeout
 2012-09-23 22:40:33 -07:00
Sean Channel
6e9a7905ba missing a space over pidfile 2012-09-23 22:33:49 -07:00
Sean Channel
ec078c7bd7 really add missing options to master conf 2012-09-23 17:28:49 -07:00
Sean Channel
1a878f17d0 add missing configuration parameters 2012-09-23 17:05:45 -07:00
Sean Channel
974a7042ed add backup_mode to minion config and config reference 2012-09-21 18:48:41 -07:00
Adam Glenn
2d8cafb16b Added exmaple to show how to force clients to only test modules as result of conversion: 
https://groups.google.com/forum/?fromgroups=#!topic/salt-users/PWMtcnNk2ko
 2012-09-12 15:11:25 -04:00
Aaron Tygart
c8cef428ca Add configuration documentation for esky 
* Add example in minion configuration template
* Add details in minion configuration documentation
 2012-09-11 22:44:00 -05:00
Sean Channel
a75682416c change equals to colon for acceptance_wait_time 
simple correction
 2012-09-07 12:33:21 -07:00
Thomas S Hatch
ce8a94d7cb Add key_logfile to master template per #1990 2012-09-07 10:48:06 -06:00
Pedro Algarvio
74518be1a6 Set a lower default for max open files. Fixes #1991. 2012-09-07 16:44:54 +01:00
Pedro Algarvio
7c50be20a0 Keep configuration variables to the minimum possible. Refs #1981. 2012-09-06 20:04:14 +01:00
Pedro Algarvio
f6edff66e9 Restore the date to the logfile datefmt. Fix #1981. 2012-09-06 19:51:24 +01:00
Pedro Algarvio
89cffc051e Raise max open files when starting master. Refs #1964 
When `salt-master` starts, it checks the soft and hard limits for max open files, it then raises it's process allowed max open files to the maximum if `max_open_files` is unset on the configuration file or to the set value.
 2012-09-06 18:07:30 +01:00
Thomas S Hatch
c6aa8ec49a Add state_verbose settings to minion template 2012-08-18 00:47:49 -06:00
Thomas S Hatch
a7afa5670a Add state_verbose data to default master config 2012-08-18 00:47:03 -06:00
Thomas S Hatch
e0c24edf29 Add setting data to the master config template for client_acl 2012-08-18 00:39:17 -06:00
Ulrich Dangel
2b8d4aa5ff Support unix style wildcard for autosigning 2012-07-26 09:17:32 +02:00
Ulrich Dangel
8d4bef6663 Support autosigning for keys - closes #1690 2012-07-26 08:31:20 +02:00
Ulrich Dangel
5ca6939b14 Use master.d and minion.d config directories per default (closes #1683) 2012-07-26 03:59:09 +02:00
Grier Johnson
16d8af2b3d Allowing permissive pki group ownership 
Allow for an optional directive that allows the salt pki_dir
to be owned by any group that root is a member of, not just
the primary group listed in the passwd directory.  This is
potentially insecure, but allows some limited access for
headless accounts to run salt without the need for sudo and
the config that goes along with that.

Conflicts:

	salt/__init__.py
	salt/utils/verify.py
 2012-07-24 14:55:15 -07:00
Thomas S Hatch
7a2973a10a Merge pull request #1540 from s0undt3ch/master 
Improved logging stuff
 2012-06-30 15:57:40 -07:00
Pedro Algarvio
3f6b4ac7b8 Improved logging configuration options from the configuration files. 
* Added the ability to configure the log levels for the console logger separate from the logfile logger. The log level provided from the cli script will override the console log level set on the configuration file but not the logfile logger setting, unless theres no setting for the logfile setting in which case it will be the same as the console log level.
* Added the ability to provide the logging formats for both the console and the logfile.
* Added the ability to provide the date format to be used.
* The module name formatting("%(name)s") now remembers the widest name, this will improve log readability.
* Also catch `KeyboardInterrupt`s while the minion is waiting to connect to the master and not just on `minion.tune_in()`.

All these new configuration settings are documented on the configuration file templates.
 2012-06-30 23:40:03 +01:00
Intchanter
5f98f6cc83 Remove 'DO NOT EDIT', as distros copy as-is. 2012-06-30 12:14:58 -06:00
Andy Sykes
fbbe74bb35 Bugfixes/documentation update for the 'include' option 
Bugfixes:
- handle case where 'include' option has an empty value
- globs were not handled correctly
- warning issued if any include option fails to match any files; this
may be deliberate by the user, but it's there to catch the case where
someone typos the path

Documentation updated with a few examples of how to use it. Minion
template config file also updated with similar examples.
 2012-06-26 20:53:27 +01:00
Thomas S Hatch
037013569b Add config comments for job_cache 2012-06-13 15:42:26 -06:00
Baiju Muthukadan
0dc4341a94 Fix typos in configuration templates 2012-06-09 22:05:29 +05:30
Michael Prokop
15eb31f1da Fix some typos in configuration template and manpage 
* usefule -> useful
* the the -> the
* issolate -> isolate
* coppied -> copied
 2012-06-07 23:18:03 +02:00
Matt Haggard
8035751678 Clarified where the top.sls file goes 2012-06-05 14:54:21 -06:00
Thomas S Hatch
459035812e Add peer_run to the master config template 2012-06-02 20:50:20 -06:00
Dax Kelson
27050174e7 Spelling fix 2012-05-24 10:48:58 -06:00
Thomas S Hatch
fbdb8649ac Add cython data on the master, Fix #1331 2012-05-21 14:33:42 -06:00
Thomas S Hatch
02485beea0 Add config data for master runner_dirs 2012-05-18 18:31:55 -06:00
Thomas S Hatch
a97d5f7b89 Add config examples for ext_pillar 2012-04-07 16:47:41 -06:00
Thomas S Hatch
b5255cff31 remove incorrect commas from the master config template, fix #1001 2012-03-25 09:48:11 -06:00
Grier Johnson
3a3db83012 Adding in append_domain config values. Allows for a harcoded domain to 
be appended to minions.  This helps with systems like solaris who, by
default, give back the short name when you ask for socket.getfqdn()
 2012-03-14 18:35:07 -07:00
Thomas S Hatch
2003cd7b42 Add providers blurb to minion config 2012-03-14 15:11:11 -06:00
Thomas S Hatch
c09d8547b4 Add pillar_roots to the master config 2012-03-08 15:26:44 -07:00
Thomas S Hatch
738a74f6ee iAdd pillar_roots to the minion config 2012-03-08 15:16:19 -07:00
Grier Johnson
f5642c9073 Adding Range Support to Salt 
Range is a cluster based metadata store.  It was used internally at
yahoo and recently open source.  You can read about range here:

https://github.com/grierj/range/wiki/Introduction-to-Range-with-YAML-files

Range allows arbitrary grouping of hosts via clusters and the storage
of metadata along with them.  Additionally there is a powerful DSL that
allows for set operations, regexes, and multilayer cluster referencing.

The implementation here runs the range query and reduces it to a list
style expression format, which means only the salt master needs to know
about range or have the range libraries installed.
 2012-03-06 18:26:23 -08:00
Thomas S Hatch
3e5bc4ff5a Add state_top to the minion config 2012-03-04 22:15:06 -07:00
Thomas S Hatch
fd792c1caa Add file directory settings to the minion config template 2012-03-04 21:59:39 -07:00
Thomas S Hatch
140b36b8a5 Add dns)_check to the minion config 2012-03-01 10:24:19 -07:00
Thomas S Hatch
bfdebaa21b Add timeout doc to master config 2012-02-05 22:54:24 -07:00
blast_hardcheese
50f95e24ea Tightened up configuration documentation 
Fixed a couple typos, run-on sentences, and reworded a particularly
confusing section.
 2012-02-03 21:17:01 -08:00
Thomas S Hatch
7e9cc5e50e Add environment to the minion config 2012-01-31 22:21:06 -07:00
Thomas S Hatch
5409ff1f43 fix typo in minion config template 2012-01-30 07:55:02 -07:00
Thomas S Hatch
d4971abf2e Add external_nodes to the config system 2012-01-25 17:01:02 -07:00
Thomas S Hatch
d113d1b442 Merge branch 'develop' of https://github.com/rubic/salt into rubic-develop 2012-01-18 14:52:42 -07:00
Jeff Bauer
30308b6a5b run salt in user space 2012-01-18 14:29:38 -06:00
Thomas S Hatch
302857aca0 Add cache_jobs to the minion config template 2012-01-17 23:59:01 -07:00
Jeff Bauer
94a8b927de added salt/config.py, setup.py changes 2012-01-16 13:36:39 -06:00
Jeff Bauer
7f30955675 rename conf files to templates, issue #518 2012-01-16 13:29:49 -06:00
Thomas S Hatch
582199a376 Add missing examples tot he config 2012-01-13 15:29:24 -07:00
Thomas S Hatch
99e7b1c704 clean up the master config a little more 2012-01-13 12:31:20 -07:00
Thomas S Hatch
b27aec6ca2 update master config with serial option 2012-01-13 11:40:32 -07:00
Byron Clark
94d022c869 root_dir is also prepended to sock_dir. 2012-01-12 21:09:12 -07:00
Brad Barden
31f7175932 very minor wording correction in config desc 2011-12-31 20:41:55 -06:00
Brad Barden
3bec12e5b7 updated description of acceptance_wait_time 2011-12-31 20:31:06 -06:00
Brad Barden
54c4eefcdb add acceptance_wait_time minion config parameter 2011-12-31 19:53:07 -06:00
Chris Scheller
47703d6b87 using compound targets for the groups now 2011-12-16 10:16:44 -05:00
Chris Scheller
b725c2d884 merge of upstream/develop to bring in compound target support 2011-12-13 14:24:59 -05:00
Thomas S Hatch
3a32864e9a Add state_verbose: False option to make states less chatty 2011-12-10 00:15:57 -07:00
Chris Scheller
3a9bb45e35 example format of the groups in the master config 2011-12-07 13:43:21 -05:00
Corey Quinn
5e404e8674 Fixed a typo or two 2011-11-26 16:15:43 -08:00
Thomas S Hatch
e9b048d5b4 add failhard to the master config file 2011-11-24 00:22:31 -07:00
Thomas S Hatch
862cf236c4 update minion config with new sub_timeout option 2011-10-24 22:48:55 -06:00
Thomas S Hatch
f6c3c31e31 Disable Cython module loading by default 2011-09-14 17:14:56 -06:00
Thomas S Hatch
b720b200a1 Add syndic data to the default config 2011-08-27 11:08:59 -06:00
Thomas S Hatch
a2363eca76 update the master config file 2011-08-27 08:51:38 -06:00
Erik Nolte
1d71c9ce19 Move remaining salt-monitor code to the salt-monitor project 2011-08-10 13:54:38 -06:00
Erik Nolte
4b442d52dd Update conf alert examples to match new syntax 2011-08-09 11:09:01 -06:00
Erik Nolte
6ee2e2befe Use the new ${var:format} syntax. Add sample alert options. 2011-08-08 12:40:27 -06:00
Erik Nolte
78067ac3db Update examples to include expression in command. 2011-08-02 13:27:38 -06:00
Erik Nolte
878e7e5846 Merge branch 'master' of github.com:thatch45/salt 2011-08-01 16:22:02 -06:00
Erik Nolte
51efb239e8 Add comments and sample mongo monitor returner 2011-08-01 16:21:01 -06:00
Thomas S Hatch
879b47b3ff Add peer publish stuff to the config 2011-07-29 22:50:17 -06:00
Thomas S Hatch
66222bcebc Fix config to reflect new default value 2011-07-29 20:54:55 -06:00
Erik Nolte
68f098fc1f Logging defaults for the monitor are different from the minion 2011-07-28 17:27:42 -06:00
Erik Nolte
1b9248b1dd Move monitor configuration from /etc/salt/minion to /etc/salt/monitor. 2011-07-28 10:41:28 -06:00
Erik Nolte
fed9c28f26 Add /etc/salt/monitor in anticipation of moving monitor configuration from /etc/salt/minion 2011-07-27 17:59:26 -06:00