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
