valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,401 Commits 24 Branches 182 Tags 341 MiB
b5a45961e5
Commit Graph

345 Commits

Author SHA1 Message Date
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
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
Jacob Hammons
2401533d9e New content added to beacon docs. 2015-09-09 11:16:55 -06:00
Justin Findlay
559512b0a6 add default_top description to docs 2015-08-26 01:44:33 -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
Mike Place
a5522f1581 Removed incorrect default config 2015-08-11 11:29:06 -06:00
Mike Place
cfb6982227 Adding some dictupdate merge tests 
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
 2015-08-11 11:28:40 -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
d8d5045d3b Updates to cloud docs for the provider > driver change in provider configs. 
Refs #24797
 2015-08-10 09:20:26 -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
f4cb659a2a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/windows/windows-package-manager.rst
    salt/modules/event.py
    salt/returners/carbon_return.py
    salt/state.py
    salt/states/pkg.py
 2015-08-03 14:50:50 -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
Jacob Hammons
3f3db4bd8e Additions for #24042 2015-07-30 15:43:21 -06:00
Jacob Hammons
db2129b199 Minor doc bug fixes 
Refs #24042
Refs #25650
Refs #21296
Refs #23788
 2015-07-30 14:39:15 -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
Colton Myers
2ae0d7d302 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/modules/win_file.py
 2015-06-16 15:13:53 -06:00
Mike Place
b7bb7eaeb2 Note about minimum worker_threads 2015-06-15 11:43:14 -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
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
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