valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,080 Commits 24 Branches 182 Tags 341 MiB
7875ee9d34
Commit Graph

288 Commits

Author SHA1 Message Date
Colton Myers
ece63c36a3 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/modules/win_groupadd.py
 2015-05-06 15:49:50 -06:00
Colton Myers
2981aed48e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-05-05 16:49:31 -06:00
Colton Myers
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/client/ssh/__init__.py
    salt/client/ssh/wrapper/__init__.py
    salt/config.py
    salt/modules/file.py
    salt/runners/lxc.py
 2015-05-05 16:26:39 -06:00
Colton Myers
87fc3161f9 Add Salt-SSH section to master config template 2015-05-04 15:05:12 -06:00
Steve Weber
36b1c87dd2 include module_dirs 
include module_dirs because its more flexible than extension_modules.
 2015-05-04 12:53:50 -04:00
Mike Place
3bc74501e4 Document many core opts 
Although these are documented in other places, we need somewhere that we
can store more in-depth, interface-specific information about various options.

This way, we can make implementation-specific comments which would not be approrpiate
for user configuration files.
 2015-04-03 17:17:06 -06:00
Nicole Thomas
44c7eb4d4b Merge pull request #22169 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-03-31 09:21:36 -06:00
Colton Myers
124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/index.rst
    doc/topics/eauth/index.rst
    salt/beacons/__init__.py
    salt/beacons/service.py
    salt/loader.py
    salt/minion.py
    salt/output/nested.py
 2015-03-30 15:10:17 -06:00
Justin Findlay
294dfe2d94 clarify and expand console log colors help 2015-03-26 23:21:30 -06:00
Colton Myers
7ba2404cc9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    conf/master
    conf/minion
    doc/ref/configuration/master.rst
    salt/loader.py
    salt/minion.py
    salt/modules/ssh.py
    salt/output/nested.py
    salt/utils/network.py
 2015-03-25 09:28:04 -06:00
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
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
 2015-03-09 12:52:14 -06:00
s8weber
ad869c74b1 add pillar_safe_render_error config 
allow a salt admin to config if the detailed render error of pillars
can be passed to the minion.
 2015-03-04 10:22:29 -05:00
Justin Findlay
e8d4882c0a remove misleading unicode message 2014-12-27 17:38:05 -07:00
Justin Findlay
2d93867c3e add color to console logger 2014-12-27 13:36:57 -07:00
Thomas S Hatch
1dcc05b049 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/yumpkg.py
 2014-12-17 15:00:26 -07: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
Thomas S Hatch
fc8535e09f Merge pull request #18702 from wolfpackmars2/patch-1 
Propose update to master config file
 2014-12-04 16:41:43 -07:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
 2014-12-04 11:11:11 -07:00
Joseph Hall
85bdf64ecb Merge pull request #18677 from QthCN/develop 
Add Returner Setting section for returner's config
 2014-12-04 05:49:44 -07:00
Steve Groesz
b65e12e790 Propose update to master config file 
Per the documentation: http://docs.saltstack.com/en/latest/ref/configuration/master.html#include-configuration  the include directive is unset by default.  As documented at the top of the master config file: "Values that are commented out but have no space after the comment are defaults that need not be set in the config. If there is a space after the comment that the value is presented as an example and is not the default."  Therefore, I propose adding a space after the comment to clarify that this is an example directive and not the default.
 2014-12-03 21:12:13 -06:00
QthCN
1f6bb0a012 Add Returner Setting section for returner's config 2014-12-04 00:12:37 +08:00
Seth House
aa964e5d3c Added state_aggregate placeholders to the master/minion conf files 2014-12-02 18:33:10 -05:00
Mike Place
b0a3d2b87b Event return filtering 2014-12-01 13:05:21 -07:00
Mike Place
8877ba7d78 Ability to queue event returns 2014-12-01 11:46:27 -07:00
Mike Place
5594be2708 Now fires events to specified returner 2014-11-26 16:31:44 -07:00
Mike Place
36017c0911 Configuration gate 2014-11-26 15:37:01 -07:00
Damian Myerscough
3ed419288a sudo_client acl directive 2014-11-17 14:13:06 -08:00
David Boucha
6406078240 pillar_opts defaults to False in develop now 2014-10-17 10:18:59 -06:00
Mike Place
a4c524176f Flag to preserve minion cache on key delete 
Refs #15673
 2014-10-03 13:29:41 -06:00
Mike Place
5f2103903d Flag to preserve minion cache on key delete 
Refs #15673
 2014-10-03 11:43:33 -06:00
Colton Myers
11ddb3874b Merge branch '2014.7' into develop 
Conflicts:
	conf/master
	conf/minion
 2014-09-26 17:46:10 -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
Colton Myers
99e97320e1 Merge branch '2014.7' into develop 
Conflicts:
	doc/ref/configuration/minion.rst
	doc/ref/states/requisites.rst
	doc/topics/troubleshooting/master.rst
	doc/topics/tutorials/index.rst
	doc/topics/tutorials/intro_scale.rst
	salt/config.py
	salt/key.py
	salt/master.py
	salt/minion.py
	salt/modules/file.py
	salt/modules/hashutil.py
	salt/modules/lxc.py
	salt/modules/oracle.py
	salt/modules/tls.py
	salt/modules/win_update.py
	salt/pillar/pepa.py
	salt/pillar/s3.py
	salt/states/augeas.py
	salt/states/win_update.py
	salt/tops/ext_nodes.py
	salt/utils/master.py
 2014-09-22 14:22:54 -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
Thomas S Hatch
39b107a283 Merge pull request #14820 from steverweber/add_conf_help 
show_timeouts, new default
 2014-09-02 12:13:31 -06:00
Scott Coil
6770ce314e add ability to target pillar from ext pillar 2014-08-31 16:46:22 -05:00
Seth House
4abc45397d Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-21 13:23:52 -06:00
Mike Place
94543fe68d Document seco range 
Per request in #15093
 2014-08-20 11:54:29 -06:00
steve
d13c7275a7 show_timeouts, new default 2014-08-14 13:10:52 -04:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian 
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
 2014-08-11 10:46:43 -07: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
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