valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,613 Commits 24 Branches 182 Tags 341 MiB
96a3d4e556
Commit Graph

148 Commits

Author SHA1 Message Date
rallytime
1b04f0ddec Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/ref/modules/all/index.rst
  - doc/ref/modules/index.rst
  - salt/modules/systemd.py
  - salt/modules/zypper.py
 2016-04-11 11:33:08 -06:00
Nicole Thomas
29333e533e Add documentation for some master/minion configs (#32454) 
Refs #32400

Adds docs for:

- cli_summary
- event_return_queue
- event_return_whitelist
- event_return_blacklist
- file_recv_max_size
- fileserver_followsymlinks
- fileserver_ignoresymlinks
- fileserver_limit_traversal
 2016-04-11 10:49:52 -06:00
Bo Maryniuk
373493c13f Remove SHA1 for SHA256 2016-03-03 21:44:14 +01:00
Bo Maryniuk
95cb59dec7 Set defalt hash as SHA1 in config and explain why. 2016-03-03 21:41:08 +01:00
Jacob Hammons
a72dc15720 Assorted doc issues 
Fixes #10330
Fixes #31216
Fixes #30464
Fixes #29520
Fixes #30261
Fixes #29636
Fixes #29528
 2016-02-24 16:56:52 -07:00
Benjamin Drung
bf92c3663b Fix typo formating -> formatting 2016-02-04 12:45:19 +01:00
Thayne Harbaugh
460a3c98cc Additional corrections to use option defaults directly from salt.config 
* correct 'id' entry in salt.config
  * add 'event_match_type' in salt.config
  * ensure that hash is only calculated in minion since it isn't needed by the master

Conflicts:
	salt/config.py
 2016-01-13 21:44:06 +00:00
Jacob Hammons
44ce704206 Updated zmq_monitor docs 2016-01-07 14:26:33 -07:00
Colton Myers
d73a7d6c4d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/ssh/index.rst
 2016-01-05 16:11:20 -07:00
Jered Sutton
01dbf385ef Adding random_master to reference and updating master_shuffle. 
Adding master_shuffle to the minion example config file as it is needed for multi-master PKI.
 2016-01-02 23:49:08 -06:00
Colton Myers
aeeaa7c90d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/config.py
    salt/minion.py
    salt/pillar/s3.py
 2015-11-09 12:12:24 -07:00
Mike Place
78f4894333 Add note about disabling master_alive_interval 
Closes #24758
 2015-11-06 14:15:06 -07:00
Colton Myers
c4c889f97b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    salt/daemons/masterapi.py
    salt/minion.py
 2015-10-20 14:47:49 -06:00
Erik Johnson
ed90103124 Add explanation of file_client: local setting masterless mode 2015-10-19 14:56:37 -05:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
Colton Myers
66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    doc/conf.py
    salt/__init__.py
    salt/cli/__init__.py
 2015-09-16 18:39:16 -06:00
Mike Place
507fb04683 Issue warning that some log levels may contain sensitive data 2015-09-14 15:39:17 -06:00
Colton Myers
1502a39779 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    conf/minion
    salt/client/__init__.py
    salt/states/dockerio.py
    salt/utils/event.py
    tests/unit/utils/event_test.py
 2015-08-11 18:12:21 -06:00
Colton Myers
32f5345d7d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    conf/minion
    doc/conf.py
    salt/modules/file.py
 2015-08-10 10:56:40 -06:00
Jacob Hammons
133d5f7885 some small changes 2015-08-06 20:26:02 -06:00
Jacob Hammons
d220c83f77 master_finger configuration docs 
switch a script to use https:// instead of http://
Refs #25751
 2015-08-06 20:23:22 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Justin Findlay
d73964ea3c add console_log_fmt color documentation 2015-07-28 16:16:29 -06:00
Mike Place
0dc28ad3e4 Return to str for master_type for 2015.5 2015-07-24 11:55:56 -06:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Stephen D. Spencer
f6dbeaf0e4 replace bad value for master_type in example minion config 
At some point, `standard` became an invalid argument for the master_type
minion config bit.  The bootstrap script, perhaps naively, uses this
file to lay down a minion config for a newly bootstrapped system.

bootstrap.sh should probably just drop an empty /etc/salt/minion rather
than trying to set every available minion opt.

In lieu of wading into bootstrap*, this allows Minion.eval_master() to
not soil itself and continue on its merry way when not operating in one
of its more advanced contexts.

* mad props to the creators/maintainers of the bootstrap script.  BASH makes
  me want to cut myself, so I appreciate complex scripts that are so
  very functional that I don't have to be responsible for
 2015-06-30 13:50:41 -05:00
Justin Findlay
e4a40b7bd8 comment whitespace in minion config 2015-06-30 03:10:56 -06:00
Justin Findlay
44cb167744 adding sudo_user minion config docs 2015-06-30 03:10:56 -06:00
Colton Myers
acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/utils/cloud.py
    salt/utils/job.py
 2015-06-24 11:44:04 -06:00
C. R. Oldham
f0c9204d8b Add references to failover parameters in conf 2015-06-23 11:07:45 -06:00
Z. Liu
55db1bf8b5 sate_output_profile default to True 2015-05-27 11:20:15 -06:00
Z. Liu
991922703b fix type: statei -> state 2015-05-27 11:20:14 -06:00
Z. Liu
0549ca6266 add 'state_output_profile' option for profile output 2015-05-27 11:20:14 -06: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
C. R. Oldham
5dbb0d433d Clarify how defaults are indicated in the config files. 2015-03-24 12:10:01 -06:00
Damian Myerscough
822c5ea626 The -F options shows all key fingerprints, -f allows you to filter out a specific key 2015-03-01 14:46:45 -08:00
Mike Place
9c225cb84d ZeroMQ socket monitoring 
This allows a user to log connection events from a ZeroMQ socket to better diagnose connectivity issues. Requires ZeroMQ 4.x.

Conflicts:
	salt/minion.py
 2015-02-19 10:18:27 -07:00
Mike Place
ec60d03e54 ZeroMQ socket monitoring 
This allows a user to log connection events from a ZeroMQ socket to better diagnose connectivity issues. Requires ZeroMQ 4.x.
 2015-02-17 15:12:13 -07:00
Mike Place
c96b4725ae Merge pull request #20465 from cachedout/safemode_config 
Fix mismatched config value for auth_safemode
 2015-02-06 08:51:40 -07:00
Mike Place
f9cb6cdeeb Fix mismatched config value for auth_safemode 
The actual default is false.

Closes #19945
 2015-02-06 09:19:10 -07:00
rallytime
9898fcf613 Merge branch '2015.2' into 'develop' 
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
 2015-01-29 17:24:04 -07:00
Kevin Bowling
23155964f5 Remove unused restart_on_error config 2015-01-27 19:24:29 -07:00
Z. Liu
d46b6b6490 sate_output_profile default to True 2015-01-03 01:36:21 +08:00
Z. Liu
3fce994d30 fix type: statei -> state 2015-01-03 01:26:12 +08:00
Z. Liu
8217f5fa66 add 'state_output_profile' option for profile output 2015-01-02 22:56:39 +08:00
Justin Findlay
e8d4882c0a remove misleading unicode message 2014-12-27 17:38:05 -07:00