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
Thomas Jackson
67176595b6
Adding docs for modules_max_memory
2013-09-26 16:32:33 -07: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
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
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
03921b3f2e
Remove rogue tabs and trailing whitespace in conf/minion
2013-02-25 11:45:42 -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
3c119f48da
Add output tot he default minion config
2013-01-10 18:13:31 -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
David Boucha
2f05c94d8a
Add Windows Repo configs to config template files
2012-12-31 11:35:31 -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
Sean Channel
0d7732930a
drop .template from cfg file names
2012-12-03 23:42:18 -08: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
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
Thomas S Hatch
3a32864e9a
Add state_verbose: False option to make states less chatty
2011-12-10 00:15:57 -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
66222bcebc
Fix config to reflect new default value
2011-07-29 20:54:55 -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
63b3ed0032
Add sample monitor configuration.
2011-07-26 15:44:28 -06:00
Travis Cline
dfe8563671
Added new option: root_dir to be prepended to 'pki_dir', 'cachedir', and 'log_file' to aid in non-root installations.
2011-06-20 21:24:50 -05:00
Pedro Algarvio
3f157549c2
Improved Logging Conclusion.
...
Concluded the improved logging stuff; Added `log_granular_levels` which will allow to tweak specific logger's levels.
Adapted the default configuration to include the improved logging stuff.
2011-05-26 11:22:37 +01:00
Pedro Algarvio
e8cac6a61f
Make Cython Support Optional.
...
Allow the user to choose not to have the cython module searching and loading enabled.
This helps with packages installed in "develop" mode where the ".pyx"'s are still present and will be tried to be compiled and loaded even though that package is fully working.
2011-05-25 09:29:48 +01:00
Thomas S Hatch
8bb3efed2d
Add test config option
2011-05-22 21:06:26 -06:00
Thomas S Hatch
8a9037df59
fix default specified in the minion conf
2011-05-19 20:45:18 -06:00
Thomas S Hatch
463eba0d5c
Add renderer info to the config file
2011-05-16 22:37:54 -06:00
Thomas S Hatch
58aabd107b
Add some options to the default config
2011-05-13 22:07:27 -06:00
Thomas S Hatch
dd9aef3938
Add some more module managers to the minion
2011-05-10 14:14:10 -06:00
Thomas S Hatch
3df637f0bd
Add module paths to the default minion config
2011-04-22 08:52:55 -06:00
Thomas S Hatch
b24801fc0d
change the hostname var to id in the config stack
2011-04-12 13:56:03 -06:00
Thomas S Hatch
43d705bfc1
Add the config backend for multiprocessing
2011-04-11 10:46:26 -06:00
Thomas S Hatch
c4b5300850
Add module configuration examples to the config file
2011-04-07 11:33:48 -06:00
Thomas S Hatch
b487e7a4c6
clean up the default minion configuration file
2011-03-28 23:10:49 -06:00
Thomas S Hatch
fa258ab1ff
Add new configuration options to the default configuration files
2011-03-24 21:53:47 -06:00
Thomas S Hatch
5bc5591e8e
Add disable_modules option to the minion conifg
2011-03-14 22:28:30 -06:00
Thomas S Hatch
3b5d4484a9
Add open mode options to the configs
2011-03-10 08:55:48 -07:00
Thomas S Hatch
a3fbf41e49
set up some light data in the config files
2011-03-04 20:27:32 -07:00
Thomas S Hatch
95abf25bd2
Change the configuration backend paths
2011-03-03 10:57:11 -07:00