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
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
