valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
15,240 Commits 24 Branches 182 Tags 341 MiB
e51f7dc94b
Commit Graph

170 Commits

Author SHA1 Message Date
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