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
