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
68,226 Commits 24 Branches 182 Tags 341 MiB
5f42fd4486
Commit Graph

164 Commits

Author SHA1 Message Date
rallytime
f577681f0b Update docs to match log_level warning default 
Fixes #34162
 2016-06-21 09:31:59 -06:00
rallytime
a5e0141eda Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/beacons/__init__.py
  - salt/modules/saltutil.py
  - salt/modules/zypper.py
  - salt/states/grains.py
  - salt/states/pkgrepo.py
  - salt/states/service.py
 2016-05-25 13:44:21 -06:00
rallytime
03b0c97520 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
 2016-05-25 12:26:00 -06:00
rallytime
b0a9f4181f Add docs for the syndic_finger config 
Fixes #18752
 2016-05-24 16:10:43 -06:00
rallytime
1febb0e13a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-05-20 10:35:25 -06:00
rallytime
5aec32b20f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-19 18:18:10 -06:00
Mike Place
755acfb97e Improve doc clarity for disable_modules documentation (#33379) 
* Improve doc clarity for disable_modules documentation

* Additional clarification on blacklisted name
 2016-05-19 16:31:41 -06:00
rallytime
35ad788470 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/minion
  - doc/ref/configuration/minion.rst
  - salt/modules/boto_elb.py
  - salt/modules/sudo.py
  - salt/states/boto_elb.py
  - salt/transport/zeromq.py
 2016-05-19 16:22:36 -06:00
C. R. Oldham
11a25255ec Bp 28467 calm mine (#33327) 
* make minion mine update behavior more configurable

* Add docs for mine_functions config var

* Remove config dup from mine config options

Refs #28467

* 2015.8 does not have _DFLT_MULTIPROCESSING_MODE

* This won't be in until 2015.8.10.
 2016-05-18 09:37:41 -07:00
C. R. Oldham
d375c1fe37 Add docs for mine_functions config var (#33326) 
* Add docs for mine_functions config var

* Note that mine_enabled essentially just doesn't add the mine
update function to the scheduler.
 2016-05-18 09:32:06 -07:00
Justin Findlay
089c1a2513 remove redundant, incorrect sudo_runas config documentation (#33318) 
* remove sudo_runas documentation

`sudo_runas` was renamed to `sudo_user` and the documentation was not
updated accordingly.

* conf/minion: update sudo_user description

The description from sudo_runas was better.
 2016-05-18 09:15:42 -07:00
rallytime
779f31cc20 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-05-17 13:41:19 -06:00
rallytime
1c43a62f85 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-17 11:23:41 -06:00
Nicole Thomas
9b42a05519 Added some more docs for master and minion config settings (#33292) 
* Added some more docs for master and minion config settings

Configs addressed:
  - auth_safemode
  - auth_timeout
  - conf_file
  - gather_job_timeout
  - jinja_lstrip_blocks
  - jinja_trim_blocks
  - max_event_size

* Change "sub minion" to "sub-minion"
 2016-05-17 09:58:20 -07:00
rallytime
5004d2fa61 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-17 10:36:07 -06:00
David Boucha
757ef20a31 fix "loose" typo (#33290) 2016-05-16 17:13:40 -06:00
Nicole Thomas
b7d98da64d Add auth_tries config option to minion.rst docs (#33287) 2016-05-16 14:17:19 -07:00
rallytime
fdc877b4dc Document new master and minion config opts for 2016.3.0 
Docs were added for:
  - master_tries
  - mine_enabled
  - mine_return_job
  - syndic_failover
  - auth_tries: this is an old setting, but docs were not found
in the minion.rst docs. This change should be added to older branches.
 2016-05-16 14:51:13 -06:00
Nicole Thomas
061851bcbf Document minion_id_caching config value (#33282) 
Fixes #33276
 2016-05-16 13:12:38 -07:00
Nicole Thomas
59a84a4674 Add docs for new master failback options (#33280) 
Fixes #32492
 2016-05-16 12:11:38 -07:00
rallytime
32779b8d71 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/x509.py
 2016-05-16 10:47:12 -06:00
Nicole Thomas
6fb25a8440 Make note of files that begin with '_' in master.d or minion.d dirs (#33224) 
* Make note of files that begin with '_' in master.d or minion.d dirs

Fixes #21903

* Be more specific about where '_' files come from.
 2016-05-13 09:14:57 -07:00
rallytime
b77993d9a1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/targeting/grains.rst
  - salt/crypt.py
  - salt/scripts.py
  - salt/states/dockerng.py
  - salt/states/pkg.py
 2016-04-13 09:42:54 -06:00
rallytime
fbaeb165c9 Merge branch '2015.5' into merge-2015.8 
No conflicts.
 2016-04-13 09:07:39 -06:00
rallytime
46a4e8a310 Remove merge conflict line 2016-04-13 09:05:31 -06:00
Andrew Pashkin
e0d947c707 Document "grains" setting in the minion configuration reference 2016-04-13 08:56:05 -06:00
rallytime
4f03f2311f Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/win_pkg.py
  - salt/transport/tcp.py
 2016-04-11 14:33:21 -06:00
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
rallytime
760f479424 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/scripts.py
  - salt/state.py
  - tests/unit/config/config_test.py
 2016-04-05 15:09:27 -06:00
rallytime
d7b4b8b081 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/config.py
 2016-04-04 12:36:14 -06:00
rallytime
7e642b8381 Audit config.py default types and values - first sweep 
- Updated standard types in VALID_OPTS dict where necessary
- Updated default values to match VALID_OPTS in DEFAULT_*_OPTS dicts
- Updated master/minion configuration reference docs to match changes
- Removed enumerate_proxy_minions value as it's not referenced anywhere in code
 2016-03-31 13:50:51 -06:00
Jacob Hammons
ff8ca5ac2e Replaces incorrect reference to master_alive_check with master_alive_interval in docs 2016-03-30 20:32:43 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
 2016-03-25 11:47:16 -06:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
 2016-03-24 15:48:00 -06:00
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply 
Resolves #32037.
 2016-03-21 22:56:17 -05:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
 2016-02-25 12:36:22 -07:00
Jacob Hammons
748acab8b5 Fixed zeromq casing in transport settings 2016-02-25 09:38:41 -07:00
Jacob Hammons
765a226907 Fixed transport description in minion / master config 2016-02-25 09:08:54 -07: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
rallytime
742d0a6b04 Change all relevant Boron references to 2016.3.0 
And more Boron deprecation warnings to Carbon
 2016-02-10 15:45:28 -07:00
rallytime
cdc7957808 Fix some autodoc import warnings from building docs 2016-02-02 12:19:38 -07:00
Jake Davis
4cbf49d487 Rename 'pillar_cache' as 'minion_pillar_cache.' 2016-01-26 10:14:35 -05:00
Jake Davis
60f7e3ea01 Fixed chmod lint issue. Added notices about security implications. 2016-01-21 10:39:31 -05:00
Jake Davis
616e9c3f2b Add pillar_cache functionality to minion. 
Allows minon to save rendered pillar data to cachedir for later use
when file_client is set to local.
 2016-01-21 10:39:31 -05:00
Colton Myers
17b919e9ec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/eauth/access_control.rst
    salt/modules/state.py
    salt/state.py
    salt/states/boto_secgroup.py
    tests/unit/modules/state_test.py
 2016-01-07 16:36:40 -07:00
Jacob Hammons
44ce704206 Updated zmq_monitor docs 2016-01-07 14:26:33 -07:00
Colton Myers
7f8e666b8c Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/states/user.py
 2016-01-06 09:30:28 -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