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
78,291 Commits 24 Branches 182 Tags 341 MiB
4af0514def
Commit Graph

359 Commits

Author SHA1 Message Date
Godefroid Chapelle
ffe267a741 Specify valid values for gitfs_provider option 2015-03-23 15:33:10 +01:00
Colton Myers
fd93491a5f Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/cloud/clouds/linodepy.py
	salt/master.py
	salt/modules/boto_route53.py
	salt/modules/virt.py
	salt/renderers/gpg.py
	salt/runners/doc.py
	salt/runners/jobs.py
	salt/runners/manage.py
	salt/runners/virt.py
	salt/utils/event.py
	salt/utils/http.py
 2015-03-16 15:12:02 -06:00
Thomas S Hatch
cc9d294fcd Merge pull request #21569 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-03-12 13:36:39 -06:00
rallytime
0171f68600 Use the full version for a versionadded tag 2015-03-11 16:29:08 -06:00
Colton Myers
fec632ae18 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/utils/cloud.py
 2015-03-11 15:18:00 -06:00
Colton Myers
ebe7eeafd9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	salt/cloud/clouds/linode.py
	salt/states/composer.py
	salt/states/win_update.py
 2015-03-11 15:14:56 -06:00
Elias Probst
bc9a30b7e9 Typo (rendered → renderer) 2015-03-11 21:15:32 +01:00
Seth House
049975a1ca Added versionadded for ext_pillar_first 2015-03-11 11:53:59 -04:00
C. R. Oldham
f171df4311 Merge forward 2015.2->develop 2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060 Merge forward 2014.7->2015.2 2015-03-01 17:55:25 -07:00
Seth House
4d974d9676 Improved presence docs; added cross-references and localhost caveat 
Closes #18436.
 2015-02-28 19:22:38 -07:00
dsumsky
6d797f50d4 - log_level_logfile and log_level configuration options inheritance docu updated 2015-02-12 19:47:59 +01:00
Thomas Jackson
da3ea213e9 Comma cleanup 2014-12-12 11:34:34 -08:00
Thomas Jackson
f268bb8b4b Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas S Hatch
3cf0cfb61d Merge branch '2014.7' into develop 2014-10-20 09:20:37 -06:00
Erik Johnson
13a92bde69 Add further clarification that gitfs auth is pygit2-only 2014-10-19 17:01:13 -05:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop 
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
 2014-10-19 18:21:19 +01:00
Erik Johnson
bb6de490ef Grammar correction 2014-10-15 22:36:12 -05:00
Mike Place
d0e90c77a6 Typo fix 2014-10-14 13:18:54 -06:00
Mike Place
0fcc0b5ae7 Document pillar ovewrite strategy 2014-10-14 13:07:26 -06:00
Mike Place
11ef20fdf5 Small doc fixes 2014-10-09 10:14:37 -06:00
Chris Rebert
5ec98a7c4f fix typos in doc/ref/configuration/master.rst 2014-10-01 14:06:11 -07:00
Thomas Jackson
6225ae5145 Remove "never timeout" feature 2014-09-23 14:13:44 -07:00
Thomas Jackson
2075fcde77 Update docs 2014-09-23 14:13:35 -07:00
Thomas Jackson
4fac8f7d22 Add master_id to master docs 2014-09-23 14:11:51 -07:00
vs
94948047cf add rotate_aes_key documentation to master-configuration reference 2014-09-22 14:43:59 -06:00
Thomas S Hatch
d88ceab872 Merge pull request #15917 from felskrone/fix_key_rotation 
Rename key_no_rotate to rotate_aes_key
 2014-09-18 14:14:18 -06:00
vs
ae07fe381b add documentation for the con_cache setting in master config 2014-09-18 14:26:49 +02:00
vs
da78c38b97 add rotate_aes_key documentation to master-configuration reference 2014-09-18 13:57:38 +02:00
Erik Johnson
13cc497b36 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Colton Myers
bb24131750 Merge branch '2014.7' into develop 2014-09-05 11:57:57 -06:00
Thomas S Hatch
71c9bf4708 Add docs for roster_file option 2014-09-05 11:55:11 -06:00
Nitin Madhok
0e61c4125d Fixing sphinx violation and warning 2014-09-03 15:22:26 -04:00
Mike Place
be60e25574 Merge branch '2014.7' into develop 2014-09-02 13:56:54 -06:00
Erik Johnson
a3c62ef119 Add default value for fileserver_backend 2014-09-02 14:35:03 -05:00
Erik Johnson
6e98ef828d gitfs_provider has no default value 2014-09-02 13:22:47 -05:00
Scott Coil
6770ce314e add ability to target pillar from ext pillar 2014-08-31 16:46:22 -05:00
Chris Rebert
a53ae15d23 copyedits 2014-08-22 11:59:13 -07:00
Thomas S Hatch
f0009be6c2 Merge branch '2014.7' into develop 2014-08-21 17:20:26 -06:00
Thomas S Hatch
2d47589c88 Merge pull request #15140 from terminalmage/pygit2-auth 
Add gitfs authentication support for pygit2>=0.20.3
 2014-08-21 15:03:35 -06:00
Seth House
4abc45397d Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-21 13:23:52 -06:00
Erik Johnson
c8be676577 Update gitfs documentation 
This adds all the new authentication options, and also moves most of the
usage examples into the gitfs walkthrough. The walkthrough has also
undergone considerable restructuring.
 2014-08-20 21:36:44 -05:00
Mike Place
94543fe68d Document seco range 
Per request in #15093
 2014-08-20 11:54:29 -06:00
Seth House
c9390ebb00 Merge pull request #14907 from cachedout/doc_master_proc 
Explain the number of master procs and worker_threads
 2014-08-11 18:26:23 -04:00
Seth House
b5bf67fdd1 Merge branch 'copyediting' of https://github.com/hulu/salt into develop 
Conflicts:
	salt/states/win_update.py
 2014-08-11 18:23:44 -04:00
Mike Place
a352cc4521 Explain the number of master procs and worker_threads 
Refs #13819
 2014-08-11 16:09:02 -06:00
Chris Rebert
75d28df71d Begone, "allows to" (sic) ! 2014-08-11 10:20:28 -07:00
Nitin Madhok
e7bea7cc87 Fixing sphinx Warnings and Errors 2014-08-11 10:20:15 -04:00
Jeff Schroeder
b0467e2265 Add version added for pillar_source_merging_strategy 
Some of my coworkers tried to use this feature and realized it isn't available. git tag --contains for the commit which adds it shows:

    $ git tag --contains 3b9891b1
    v2014.7
 2014-08-07 15:30:24 -05:00
Thomas Jackson
0ce353ddfb Add master_id to master docs 2014-08-01 16:38:22 -07:00
rallytime
a8cd830d52 Change "Helium" to 2014.7.0 in affected docs 2014-07-15 16:53:29 -06:00
Volker Schwicking
f3d6c705ee add settings multimaster-pki 2014-07-15 12:09:52 +02:00
Thomas S Hatch
1577bf0fad Merge pull request #14178 from khrisrichardson/spelling 
add sphinx spelling extension. enforce en_US
 2014-07-14 15:43:33 -06:00
Colton Myers
08d7847e44 Add configuration file location for minion (and FreeBSD for master) 2014-07-14 12:22:27 -06:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Erik Johnson
2849950bce Docs cleanup 
Fixes double-colons by making them code-block directives, so they do not
erroneously show up as "PYTHON" blocks. Also corrects a few instances of
2nd person pronoun usage.
 2014-07-13 11:02:33 -05:00
vs
16269130e6 Merge remote-tracking branch 'upstream/develop' into minion_failover_master 
Conflicts:
	doc/ref/configuration/master.rst
 2014-05-30 12:14:19 -07:00
Thomas S Hatch
b8897a5b0d rename the sls renderer to the yamlex renderer 2014-05-30 09:28:20 -06:00
Thomas S Hatch
185eae31cd Merge branch 'serializers-migration' of https://github.com/johnnoone/salt into johnnoone-serializers-migration 
Conflicts:
	salt/pillar/__init__.py
 2014-05-30 09:16:21 -06:00
vs
f007cfecd5 add missing 's' 2014-05-30 08:04:08 -07:00
vs
22d590a9cc added max_minions setting 2014-05-30 07:58:01 -07:00
vs
918502c8fe added section for 'presence_events' 2014-05-30 06:51:03 -07:00
Erik Johnson
3bcfc735f8 Add dulwich to gitfs_provider docs 2014-05-21 15:00:19 -05:00
Erik Johnson
8d4370accc Fix indentation 
This brings the note about the gitfs walthrough outside of the YAML
code-block.
 2014-05-21 01:34:28 -05:00
Seth House
59f2d07ffb Bunch of misc rST fixes 2014-05-14 12:02:55 -06:00
Thomas S Hatch
a74828f437 Fixes for #12673 2014-05-13 11:32:28 -06: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
Chris Rebert
7d1df94bb1 copyedit ref docs 2014-04-30 14:08:31 -07:00
Wes Turner
6aa523d9d1 DOC: Update GitFS documentation (syntax, links) 2014-04-22 05:42:10 -05:00
Erik Johnson
910393fa3c Add new params to master config docs 
Also fixed up some of the wording on the other recently-added remote
fileserver configuration parameters.
 2014-04-11 11:40:01 -05:00
Xavier Barbosa
3b9891b1dc implement merging strategy into pillar 2014-04-09 06:45:11 +02:00
Erik Johnson
0f5160345b Add new params to master docs 2014-04-08 16:13:29 -05:00
Erik Johnson
ae11b2678a Add new minionfs params to docs 2014-04-07 11:29:24 -05:00
Erik Johnson
5e1870d1c5 Add info on per-remote gitfs_base to master docs 2014-03-26 16:29:07 -05:00
Seth House
a06ccfef2f Added docs for the extension_modules setting 
Refs #11030
 2014-03-07 15:13:41 -08:00
Tarjei Husøy
aec6b11d9a Fix inconsistent header formatting in docs 2014-03-05 22:21:11 +01:00
Erik Johnson
edc39496df Correct docs inaccuracy 
state_verbose does not default to False. This was changed a long time
ago but the docs were never updated.
 2014-03-02 09:56:14 -06:00
Jens Rantil
302629bc72 Fix typo: maintinance => maintenance 2014-02-27 14:59:24 +01:00
Mike Place
0ce328c7e7 Fix line length 2014-02-26 13:32:33 -07:00
Erik Johnson
f725f00614 Add new config parameters to the docs 2014-02-25 22:54:25 -06:00
Erik Johnson
d306b0d9a2 Add svnfs params to master config docs 2014-02-20 03:21:36 -06:00
Erik Johnson
a0f9213679 Add new hgfs features to docs 2014-02-18 21:01:42 -06:00
Erik Johnson
bccd82aacf Added additional docs on gitfs mountpoints and per-remote params 2014-02-15 01:19:02 -06:00
Erik Johnson
b24af2c8b3 Add gitfs_mountpoint master conf parameter to docs 2014-02-15 00:30:47 -06:00
Erik Johnson
9773caba98 Adjust docs to reflect additional hgfs changes 2014-02-08 13:23:54 -06:00
Erik Johnson
ed2190b65e Add hgfs config params to docs 2014-02-08 05:25:07 -06:00
Erik Johnson
ffd189cc7b Add info about root_dir and the options to which it is prepended 2014-02-04 15:46:22 -06:00
Forrest Alvarez
563f99538d Fixed some errors that were getting generated. 2014-01-12 05:33:04 +00:00
Forrest Alvarez
13a7acff03 Updated the master configuration docs to fill out the rest of the items that were missing from the docs, also moved some stuff around so it was in the same order as the actual master conf file. 2014-01-12 05:23:09 +00:00
Forrest Alvarez
afab1e2d63 Updated the master config file with some options, made it down to the color option. Looking at how this is set up, things might need to be moved around. 2014-01-10 05:54:07 +00:00
Erik Johnson
6ab77e5317 Replace references to Hydrogen release in docs 
This replaces references to Hydrogen (in versionadded/versionchanged
directives as well as a few other mentions), to reflect the actual
release number of 2014.1.0.
 2014-01-07 12:06:53 -06:00
Erik Johnson
5a8faf4810 Add gitfs configuration parameters to master config docs 
This commit adds the new gitfs_provider parameter, as well as several
other params for gitfs that were not documented.
 2014-01-03 21:06:03 -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
Seth House
5ccc3c0b59 rST fix 2013-12-13 22:52:02 -07:00
Seth House
d158fbefd4 Changed conf-log to conf_log to match the other conf_* roles 
@s0undt3ch Hope you don't mind.
 2013-12-13 17:34:59 -07:00
Thomas S Hatch
167c110f43 Add doc for yaml_utf8 2013-12-13 14:40:47 -07:00
Erik Johnson
e7e84ff305 Add autoreject_file to master config file documentation 
Included a versionadded directive to note when this was added, to reduce
confusion.
 2013-11-21 17:12:31 -06:00
Sijis Aviles
1f27476fdd removed double colons in master documentation to match existing formatting 2013-11-09 13:54:39 -06:00
Colton Myers
f50ebad1f5 Add publish example for limiting targets 2013-11-06 11:03:31 -07:00
Thomas S Hatch
a280c4dfa1 Merge pull request #7621 from cachedout/develop 
Documentation changes/updates
 2013-10-04 12:09:00 -07:00
Erik Johnson
f6e521a9e3 Add fileserver_backend to master configuration page 2013-10-04 11:04:14 -05:00
Mike Place
bd1da286ac -- Please review for accuracy prior to merge -- 
While I'm still learning the external pillar system, I suspect that this documentation was written when a smaller number of external pillars were available. I have removed the plain-text reference and instead linked directly to the repository directory which holds all pillars. If my assumption/understanding is incorrect, please feel free to reject. :]
 2013-10-03 15:41:37 -06:00
Pedro Algarvio
0b0e82baaa Update include documentation examples to current default values. 2013-10-02 13:36:47 +01:00
Pedro Algarvio
e5a8b46b7e Updated logging documentation on a common place. 
* All logging information now resides on it's own document where all the currently documented features are explained.
* The master and minion logging configuration sections are now minimal and direct each option to the right place on the logging doc.
* A link to the logging doc was also added to the configuration document topic to help debugging issues when troubles are found.
* Headers fixed in the minion and master configuration docs
 2013-08-30 19:32:40 +00:00
Pedro Algarvio
680ca716ec Add linkable ref's to the minion and master logging configuration sections. 2013-08-30 19:32:39 +00:00
Erik Johnson
8f03781ca9 Add missing master configuration file parameters 
This commit adds some recently-added master config options to the online
docs.
 2013-08-08 15:10:32 -05:00
Erik Johnson
f59cbc427f Formatting corrections 2013-08-03 18:53:05 -05:00
Pedro Algarvio
e46e81e1f2 Direct link to python's documentation regarding the LogRecord attributes. 2013-07-23 16:59:47 +01:00
Pedro Algarvio
70b57bd0a2 Link master.rst to time.strftime's python documentation. 2013-07-23 16:46:05 +01: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
Seth House
059b287f65 Fixed two rST mistakes 2013-07-01 13:42:59 -06:00
martin f. krafft
c7053e9adf Reclass master_tops/ext_pillar docs update 
Signed-off-by: martin f. krafft <madduck@madduck.net>
 2013-07-01 15:01:11 +02:00
ran
38aa906da0 fix mine while caching is disabled 2013-06-25 23:42:09 +03:00
Colton Myers
ef4ba74c10 Add additional clarification for autosign in docs 2013-06-17 16:28:05 -06:00
Jonathan Ballet
69d77d8c1a output: fix typo introduced in 5f473b 2013-06-17 17:31:44 +02:00
Jonathan Ballet
5f473bb17e output: new state output 'changes' 
It displays states result in 'full' mode unless nothing changed, in
which case it displays results in 'terse' mode.
 2013-06-17 15:22:57 +02:00
Thomas S Hatch
594eb74968 Add docs on minion_data_cache 2013-06-11 10:35:45 -06:00
yinchuan
b80f904853 Node Groups: 'L@foo.domain.com,bar.domain.com,baz.domain.com or bl*.domain.com' not 'and' 
use 'and' at this confuse me, and in the http://docs.saltstack.com/topics/targeting/nodegroups.html also use 'or'.
 2013-05-29 11:08:32 +08:00
Colton Myers
9a2c99419d Add docs for state_output: 'mixed' 2013-05-06 15:40:13 -06:00
Thomas S Hatch
ac05ae467c Add some docs on minimum worker threads 2013-04-22 11:05:30 -06:00
Gary Wilson Jr
bd499e5640 Fixed several minor misspellings and acronym capitalizations. 2013-03-18 16:42:57 -05:00
Bruno Clermont
390c5898c4 we're talking about master configuration here. 
fix copy-paste from doc/ref/configurations/minion.rst.
 2013-02-21 16:15:27 +08:00
Thomas S Hatch
9e1001cb3b Fix some spelling 2013-02-04 09:40:21 -07:00
Thomas S Hatch
65d4d84295 Docs per #3543 2013-02-02 15:47:04 -07:00
Pedro Algarvio
13b6e35668 Remove pub_refresh and sub_timeout from both documentation and salt.config. 2013-01-15 23:20:01 +00:00
Sean Channel
6b35ca83d0 wordsmith logging options 2013-01-10 16:51:44 -08:00
Sean Channel
54634188b2 copy/paste typo 2013-01-09 23:55:13 -08:00
Sean Channel
77d24868af update logging options 2013-01-09 23:45:11 -08:00
Erik Johnson
86c10c673d Leave off trailing slash 
None of the other directory paths have a trailing slash, this commit
makes a small aesthetic change.
 2012-12-31 04:32:03 -06:00
Thomas S Hatch
85d6d584a5 Add docs to the master for state_output and state_verbose 
Fix #2857
 2012-12-10 17:39:21 -07:00
Mike Yumatov
bafd02e827 Fix pillar_roots configuration example 2012-11-12 10:12:40 +04:00
Seth House
e55262f60a Added a documentation anchor for the master/minion config 2012-10-25 15:31:38 -06:00
Seth House
c6f7337ecd A bevy of line-length adjustments and misc rST fixes 2012-10-25 14:36:02 -06:00
G. Clifford Williams
5886991459 another minor typo correction 2012-10-25 12:26:52 -05:00
G. Clifford Williams
6b0ea10b7e minor typo correction 2012-10-25 12:19:35 -05:00
Thomas S Hatch
a6ac5ce8f3 Add some docs 2012-10-11 23:01:18 -06:00
Thomas S Hatch
818c2bafaa Fix #2125 2012-09-27 19:28:08 -06:00
Aaron Tygart
d445ad0e2b Merge branch 'upstream/develop' into mongo_pillar 2012-09-22 23:30:56 -05:00
Aaron Tygart
89630283cc Update doc references to include ext_pillar docs 2012-08-27 13:53:25 -05:00
Ulrich Dangel
6fda0d22e7 Mention autosigning in master documentation 2012-08-24 16:20:19 +01:00
Ulrich Dangel
878e53db1b Update documentation about default includes 2012-08-24 16:14:21 +01:00
Thomas S Hatch
32856600c2 Add client_acl to master config docs 2012-08-18 00:34:40 -06:00
Thomas S Hatch
9737c36708 Add docs for job_cache 2012-06-13 15:50:31 -06:00
Thomas S Hatch
ac4510fb42 Add reference documentation for peer_run 2012-06-02 21:05:17 -06:00
L.C. Rees
3315dad9e7 documentation updates 2012-05-22 22:43:12 -06:00
Thomas S Hatch
0ab61b32c8 Add cython_enable to master docs 2012-05-21 14:36:34 -06:00
Thomas S Hatch
89f8e59103 Add docs for new runner_dirs option, fix #1301 2012-05-18 18:39:22 -06:00
Thomas S Hatch
80f754a773 update some config docs 2012-04-27 13:13:42 -06:00
Gordon McAllister
72c2014767 War on typos 
Also cleanup whitespace and break some long lines
 2012-03-14 17:09:19 -07:00
David Boucha
ea83a765a3 Fix a typo 2012-03-08 21:08:45 -07:00
David Boucha
3a5bb0407d Various Doc fixes. 
Mainly small typo fixes and clarifying some language
 2012-03-08 21:05:52 -07:00
Thomas S Hatch
427666236d Add environment to the configuration guide 2012-02-09 11:57:37 -07:00
Thomas S Hatch
483c33bc7c Add the documentation for the external-nodes option 2012-02-09 11:45:59 -07:00
Jeff Bauer
d67c7f5613 updated documentation for user, fixed configuration template links 2012-01-18 23:04:48 -06:00
Seth House
b9dc071b45 Added host of reST fixes for the release 2012-01-15 22:54:23 -07:00
Thomas S Hatch
a24a880e56 fix ref to logfile in master configuration ref 2012-01-13 17:27:21 -07:00
Thomas S Hatch
e9a69b1265 update config guide for the master 2012-01-13 12:35:56 -07:00
Seth House
a912520cf8 Reorganized and reworded the contents page for better focus 
Also moved the TOC to its own doc to provide a complete and
comprehensive overview. Removed some extra and unecessary toctree calls.
 2011-10-30 12:41:14 -06:00
Seth House
29a564d6f5 Split the configuration doc into master/minion configuration docs 2011-10-30 10:04:21 -06:00