Commit Graph

164 Commits

Author SHA1 Message Date
Thomas S Hatch
d113d1b442 Merge branch 'develop' of https://github.com/rubic/salt into rubic-develop 2012-01-18 14:52:42 -07:00
Jeff Bauer
30308b6a5b run salt in user space 2012-01-18 14:29:38 -06:00
Thomas S Hatch
302857aca0 Add cache_jobs to the minion config template 2012-01-17 23:59:01 -07:00
Jeff Bauer
94a8b927de added salt/config.py, setup.py changes 2012-01-16 13:36:39 -06: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
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
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
Chris Scheller
47703d6b87 using compound targets for the groups now 2011-12-16 10:16:44 -05:00
Chris Scheller
b725c2d884 merge of upstream/develop to bring in compound target support 2011-12-13 14:24:59 -05:00
Thomas S Hatch
3a32864e9a Add state_verbose: False option to make states less chatty 2011-12-10 00:15:57 -07: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
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
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
Erik Nolte
1d71c9ce19 Move remaining salt-monitor code to the salt-monitor project 2011-08-10 13:54:38 -06:00
Erik Nolte
4b442d52dd Update conf alert examples to match new syntax 2011-08-09 11:09:01 -06:00
Erik Nolte
6ee2e2befe Use the new ${var:format} syntax. Add sample alert options. 2011-08-08 12:40:27 -06:00
Erik Nolte
78067ac3db Update examples to include expression in command. 2011-08-02 13:27:38 -06:00
Erik Nolte
878e7e5846 Merge branch 'master' of github.com:thatch45/salt 2011-08-01 16:22:02 -06:00
Erik Nolte
51efb239e8 Add comments and sample mongo monitor returner 2011-08-01 16:21:01 -06:00
Thomas S Hatch
879b47b3ff Add peer publish stuff to the config 2011-07-29 22:50:17 -06:00
Thomas S Hatch
66222bcebc Fix config to reflect new default value 2011-07-29 20:54:55 -06:00
Erik Nolte
68f098fc1f Logging defaults for the monitor are different from the minion 2011-07-28 17:27:42 -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
fed9c28f26 Add /etc/salt/monitor in anticipation of moving monitor configuration from /etc/salt/minion 2011-07-27 17:59:26 -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
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
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
27afcbf59f Add File server valuse to the config file 2011-05-21 17:11:21 -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
61dc847706 update the master config for new topology changes 2011-05-13 22:14:07 -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
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
b487e7a4c6 clean up the default minion configuration file 2011-03-28 23:10:49 -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
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
Thomas S Hatch
c9bbcbde66 Add configuration templates 2011-02-20 13:33:52 -07:00