rallytime
609dcdbac1
Add default for pillar_source_merging_strategy in conf/master file
...
Fixes #21511
2015-03-24 14:53:18 -06:00
C. R. Oldham
a35f38a71e
Clarify how defaults are indicated in the config files.
2015-03-24 12:27:51 -06:00
C. R. Oldham
5dbb0d433d
Clarify how defaults are indicated in the config files.
2015-03-24 12:10:01 -06:00
Seth House
7ce1becf34
Added note about using log_level_logfile with log_granular_levels
2014-12-16 18:18:21 -07:00
Seth House
90edd2185b
Removed trailing comma from log_granular_levels example; is invalid YAML
...
Thanks to F. Langelier for the report.
2014-12-16 18:13:07 -07:00
Seth House
aa964e5d3c
Added state_aggregate placeholders to the master/minion conf files
2014-12-02 18:33:10 -05:00
Mike Place
5f2103903d
Flag to preserve minion cache on key delete
...
Refs #15673
2014-10-03 11:43:33 -06:00
rallytime
4402fd80fb
Clean up formatting of minion stock conf file
2014-09-26 15:38:49 -06:00
rallytime
33369370d9
Clean up formatting of master stock conf file
2014-09-26 15:15:40 -06:00
Mike Place
53445d607b
Copy con_cache doc into master conf.
...
Refs PR #15918
2014-09-18 09:23:27 -06:00
Mike Place
50579b31cd
Set default to false
2014-09-17 14:38:42 -06:00
Mike Place
0a4b370bc7
Add note about large install to config file
2014-09-15 12:42:59 -06:00
Mike Place
305956c539
Fire an event on AES key rotate.
...
Also setup a config file option for ping-on-rotate.
2014-09-15 11:39:58 -06:00
Mike Place
94543fe68d
Document seco range
...
Per request in #15093
2014-08-20 11:54:29 -06:00
rallytime
f0d9db2497
Removed the term "Hydrogen" from versionadded notation
2014-07-01 15:01:12 -06:00
Mathieu Le Marec - Pasquet
da758409d4
make color stripping configurable
2014-06-20 09:53:28 +02:00
Cowyn Li
9436dbd84c
Provide a reasonable sample path for autoreject_file without confusion
2014-06-17 19:01:31 +08:00
steverweber
84bfe9ce18
auto accept keys in minions_autosign
...
Accept keyids if a file with the same name is found in minions_autosign.
Also option to check the datestamp of the file and only accept if within timeout.
2014-05-12 19:56:39 -04:00
Mike Place
79a758e3aa
Raise max to 1 MiB.
...
Otherwise, the loader will tank.
2014-04-29 17:09:14 -06:00
Mike Place
0b1da0dd84
Use KiB
2014-04-29 17:09:14 -06:00
Mike Place
97598126a3
Max message size for event bus.
...
Closes #11372
2014-04-29 17:09:14 -06:00
Mike Place
756b0e386b
Remove hard-coded MD5 wherever possible.
...
Doing so helps Salt to achieve FIPS compliance. Closes #11486 and #7318 .
2014-04-07 14:14:19 -06:00
Tom Atkinson
72e76efeb5
Document the changes setting for state_output in default master conf file
2014-04-07 17:26:07 +02:00
Jens Rantil
347c0ae5f1
fix(config/master): typo
2014-03-14 11:16:36 +01:00
Seth House
a06ccfef2f
Added docs for the extension_modules setting
...
Refs #11030
2014-03-07 15:13:41 -08:00
Colton Myers
cd9480c261
Clarify the actions salt will take when run as non-root
...
Ref #10433
Also fix a dangling preposition
2014-02-14 14:52:19 -07:00
Erik Johnson
fa468c3797
Fix typo in master config file
...
Resolves #10144 .
2014-02-03 14:12:21 -06:00
Thomas S Hatch
962fc36936
autoreject is the config value
2014-01-11 13:26:33 -07:00
Erik Johnson
d5440647d4
Add gitfs_provider to master config file template
...
Also moved a paragraph that seemed to be out of place
2014-01-03 20:57:25 -06:00
Thomas S Hatch
b3b6c0bcee
Merge pull request #8734 from terminalmage/autoreject_file
...
add an autoreject_file parameter to the master config file
2013-12-30 09:24:03 -08:00
C. R. Oldham
d9d359ba05
Enable cryptographic signing of messages published from the master.
2013-12-11 13:47:47 -07:00
Thomas S Hatch
4bffa13abf
Merge pull request #9108 from pakdel/file_recv_max_size
...
Added an option to limit maximum size of a file that can be pushed to master by files_recv
2013-12-09 10:34:06 -08:00
Amir Pakdel
49141cf042
file_recv_max_size config is specified in megabyte
2013-12-09 10:50:52 -05:00
Thomas S Hatch
fa1c9c4401
Disable fileserver events by default
...
@jacksontj, this turns off these event by default and you will
need to set this flag in your config in the future
2013-12-08 22:46:36 -07:00
Amir Pakdel
c934a9bd36
Added an option to limit max size in files_recv
...
The default is set to 100MB, which means pushing
larger files will stop when reaches this limit.
This limit can be adjusted by file_recv_max_size
option in the master's config file.
2013-12-08 15:01:20 -05:00
Jorge-Rodriguez
25573412d4
Added ssl verify flag to the gitfs backend.
2013-12-03 09:54:47 +02:00
Jorge-Rodriguez
ddf4c6dbe2
Added SSL verify flag for pillar git backend, in case getting around
...
self-signed certificates is needed.
2013-12-02 10:40:11 +02:00
Erik Johnson
e9eae00028
Add autoreject_file to master config template
2013-11-21 17:12:10 -06:00
C. R. Oldham
236a1656d3
Implement #8333
2013-11-08 13:29:47 -07:00
Mike Place
459feb70f3
Provide a configuration switch to enable limited directory traversal.
2013-10-31 17:07:02 -06:00
Mike Place
5aa4691a09
New configuration option to disable lspci queries for GPU data on master.
2013-10-22 14:36:13 -06:00
Mickey Malone
2675f34079
Added more symlink funtionality
...
Cleaned up some of the comments/doc language
2013-09-25 22:21:27 -05:00
Mickey Malone
84fee92e72
Merge remote-tracking branch 'upstream/develop' into develop
2013-09-24 21:37:47 -05:00
Mickey Malone
1be07f2ff0
Added some more documentation to fileserver_followsymlinks
2013-09-24 21:36:16 -05:00
mlister2006
2ecaddb484
Adding master side acl support for mine.get
2013-09-23 12:00:19 -04:00
Mickey Malone
105806ead3
Added ignore symlink option. Cleaned up roots.
2013-09-20 20:25:48 -05:00
Mickey Malone
237adbf3e6
Made roots fileserver backend symlink traversal configureable
2013-09-20 12:47:05 -05:00
Erik Johnson
46d68c8669
Fix inconsistent indentation in config file templates
...
In the config file templates, some parameters are commented out with a
pound sign, and others are commented out using a pound sign and a space.
This has led to some confusion when people uncomment some params to use
them and then there are errors when PyYAML tries to render the data.
This commit makes the commenting of config parameters uniform, using
just a pound sign with no extra space.
2013-09-13 16:32:21 -05:00
micahhausler
b27bb8b1c1
Fixed #6803 -- Added example to ignore serving vim swapfiles
2013-09-06 15:01:23 -04:00
Jason Sommer
201b4f8776
Added gitfs_root option
2013-08-17 20:14:57 -05:00
