Commit Graph

104 Commits

Author SHA1 Message Date
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
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
Daniel Naegele
daa4007d78 quickfix for IPv6, added basic documentation to the default configs 2013-06-18 02:04:17 +02: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
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
4e0f2f2110 Add color value to the default config 2013-01-10 18:15:05 -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
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
Jeff Bauer
7f30955675 rename conf files to templates, issue #518 2012-01-16 13:29:49 -06: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
Chris Scheller
47703d6b87 using compound targets for the groups now 2011-12-16 10:16:44 -05: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
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
Thomas S Hatch
879b47b3ff Add peer publish stuff to the config 2011-07-29 22:50:17 -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
Thomas S Hatch
adb4fef229 Add the renderer to the master config comments 2011-05-28 13:40:37 -06:00
Thomas S Hatch
8b4473c27c Change the top file structure to be lighter 2011-05-28 12:12:05 -06:00
Thomas S Hatch
677cac28c3 Add environment seeking to the master file server 2011-05-26 23:35:45 -06:00
Thomas S Hatch
77c67af2cc Add the new file server layout to the conf file 2011-05-26 22:30:38 -06: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
Thomas S Hatch
27afcbf59f Add File server valuse to the config file 2011-05-21 17:11:21 -06:00
Thomas S Hatch
61dc847706 update the master config for new topology changes 2011-05-13 22:14:07 -06:00
Thomas S Hatch
5689a5e616 remove ucarp cluster data from the code 2011-04-01 18:35:55 -06:00
Thomas S Hatch
6797c3f3da Add documentation to the salt master configuration file 2011-03-28 23:34:54 -06:00
Thomas S Hatch
da612fdfca Clean up the default master configuration file 2011-03-28 22:59:54 -06:00
Thomas S Hatch
b5c05799c8 Add keep_jobs option to the configuration 2011-03-24 21:59:01 -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
24db7402fb Add auto_accept to the config file 2011-03-24 19:19:10 -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