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
Sean Channel
974a7042ed
add backup_mode to minion config and config reference
2012-09-21 18:48:41 -07:00
Adam Glenn
2d8cafb16b
Added exmaple to show how to force clients to only test modules as result of conversion:
...
https://groups.google.com/forum/?fromgroups=#!topic/salt-users/PWMtcnNk2ko
2012-09-12 15:11:25 -04:00
Aaron Tygart
c8cef428ca
Add configuration documentation for esky
...
* Add example in minion configuration template
* Add details in minion configuration documentation
2012-09-11 22:44:00 -05:00
Sean Channel
a75682416c
change equals to colon for acceptance_wait_time
...
simple correction
2012-09-07 12:33:21 -07:00
Thomas S Hatch
ce8a94d7cb
Add key_logfile to master template per #1990
2012-09-07 10:48:06 -06:00
Pedro Algarvio
74518be1a6
Set a lower default for max open files. Fixes #1991 .
2012-09-07 16:44:54 +01:00
Pedro Algarvio
7c50be20a0
Keep configuration variables to the minimum possible. Refs #1981 .
2012-09-06 20:04:14 +01:00
Pedro Algarvio
f6edff66e9
Restore the date to the logfile datefmt. Fix #1981 .
2012-09-06 19:51:24 +01:00
Pedro Algarvio
89cffc051e
Raise max open files when starting master. Refs #1964
...
When `salt-master` starts, it checks the soft and hard limits for max open files, it then raises it's process allowed max open files to the maximum if `max_open_files` is unset on the configuration file or to the set value.
2012-09-06 18:07:30 +01:00
Thomas S Hatch
c6aa8ec49a
Add state_verbose settings to minion template
2012-08-18 00:47:49 -06:00
Thomas S Hatch
a7afa5670a
Add state_verbose data to default master config
2012-08-18 00:47:03 -06:00
Thomas S Hatch
e0c24edf29
Add setting data to the master config template for client_acl
2012-08-18 00:39:17 -06:00
Ulrich Dangel
2b8d4aa5ff
Support unix style wildcard for autosigning
2012-07-26 09:17:32 +02:00
Ulrich Dangel
8d4bef6663
Support autosigning for keys - closes #1690
2012-07-26 08:31:20 +02:00
Ulrich Dangel
5ca6939b14
Use master.d and minion.d config directories per default ( closes #1683 )
2012-07-26 03:59:09 +02:00
Grier Johnson
16d8af2b3d
Allowing permissive pki group ownership
...
Allow for an optional directive that allows the salt pki_dir
to be owned by any group that root is a member of, not just
the primary group listed in the passwd directory. This is
potentially insecure, but allows some limited access for
headless accounts to run salt without the need for sudo and
the config that goes along with that.
Conflicts:
salt/__init__.py
salt/utils/verify.py
2012-07-24 14:55:15 -07:00
Thomas S Hatch
7a2973a10a
Merge pull request #1540 from s0undt3ch/master
...
Improved logging stuff
2012-06-30 15:57:40 -07:00
Pedro Algarvio
3f6b4ac7b8
Improved logging configuration options from the configuration files.
...
* Added the ability to configure the log levels for the console logger separate from the logfile logger. The log level provided from the cli script will override the console log level set on the configuration file but not the logfile logger setting, unless theres no setting for the logfile setting in which case it will be the same as the console log level.
* Added the ability to provide the logging formats for both the console and the logfile.
* Added the ability to provide the date format to be used.
* The module name formatting("%(name)s") now remembers the widest name, this will improve log readability.
* Also catch `KeyboardInterrupt`s while the minion is waiting to connect to the master and not just on `minion.tune_in()`.
All these new configuration settings are documented on the configuration file templates.
2012-06-30 23:40:03 +01:00
Intchanter
5f98f6cc83
Remove 'DO NOT EDIT', as distros copy as-is.
2012-06-30 12:14:58 -06:00
Andy Sykes
fbbe74bb35
Bugfixes/documentation update for the 'include' option
...
Bugfixes:
- handle case where 'include' option has an empty value
- globs were not handled correctly
- warning issued if any include option fails to match any files; this
may be deliberate by the user, but it's there to catch the case where
someone typos the path
Documentation updated with a few examples of how to use it. Minion
template config file also updated with similar examples.
2012-06-26 20:53:27 +01:00
Thomas S Hatch
037013569b
Add config comments for job_cache
2012-06-13 15:42:26 -06:00
Baiju Muthukadan
0dc4341a94
Fix typos in configuration templates
2012-06-09 22:05:29 +05:30
Michael Prokop
15eb31f1da
Fix some typos in configuration template and manpage
...
* usefule -> useful
* the the -> the
* issolate -> isolate
* coppied -> copied
2012-06-07 23:18:03 +02:00
Matt Haggard
8035751678
Clarified where the top.sls file goes
2012-06-05 14:54:21 -06:00
Thomas S Hatch
459035812e
Add peer_run to the master config template
2012-06-02 20:50:20 -06:00
Dax Kelson
27050174e7
Spelling fix
2012-05-24 10:48:58 -06:00
Thomas S Hatch
fbdb8649ac
Add cython data on the master, Fix #1331
2012-05-21 14:33:42 -06:00
Thomas S Hatch
02485beea0
Add config data for master runner_dirs
2012-05-18 18:31:55 -06:00
Thomas S Hatch
a97d5f7b89
Add config examples for ext_pillar
2012-04-07 16:47:41 -06:00
Thomas S Hatch
b5255cff31
remove incorrect commas from the master config template, fix #1001
2012-03-25 09:48:11 -06:00
Grier Johnson
3a3db83012
Adding in append_domain config values. Allows for a harcoded domain to
...
be appended to minions. This helps with systems like solaris who, by
default, give back the short name when you ask for socket.getfqdn()
2012-03-14 18:35:07 -07:00
Thomas S Hatch
2003cd7b42
Add providers blurb to minion config
2012-03-14 15:11:11 -06:00
Thomas S Hatch
c09d8547b4
Add pillar_roots to the master config
2012-03-08 15:26:44 -07:00
Thomas S Hatch
738a74f6ee
iAdd pillar_roots to the minion config
2012-03-08 15:16:19 -07:00
Grier Johnson
f5642c9073
Adding Range Support to Salt
...
Range is a cluster based metadata store. It was used internally at
yahoo and recently open source. You can read about range here:
https://github.com/grierj/range/wiki/Introduction-to-Range-with-YAML-files
Range allows arbitrary grouping of hosts via clusters and the storage
of metadata along with them. Additionally there is a powerful DSL that
allows for set operations, regexes, and multilayer cluster referencing.
The implementation here runs the range query and reduces it to a list
style expression format, which means only the salt master needs to know
about range or have the range libraries installed.
2012-03-06 18:26:23 -08:00
Thomas S Hatch
3e5bc4ff5a
Add state_top to the minion config
2012-03-04 22:15:06 -07:00
Thomas S Hatch
fd792c1caa
Add file directory settings to the minion config template
2012-03-04 21:59:39 -07:00
Thomas S Hatch
140b36b8a5
Add dns)_check to the minion config
2012-03-01 10:24:19 -07:00
Thomas S Hatch
bfdebaa21b
Add timeout doc to master config
2012-02-05 22:54:24 -07:00
blast_hardcheese
50f95e24ea
Tightened up configuration documentation
...
Fixed a couple typos, run-on sentences, and reworded a particularly
confusing section.
2012-02-03 21:17:01 -08:00
Thomas S Hatch
7e9cc5e50e
Add environment to the minion config
2012-01-31 22:21:06 -07:00
Thomas S Hatch
5409ff1f43
fix typo in minion config template
2012-01-30 07:55:02 -07:00
Thomas S Hatch
d4971abf2e
Add external_nodes to the config system
2012-01-25 17:01:02 -07:00
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
