Commit Graph

239 Commits

Author SHA1 Message Date
Johannes
1434539af7 Fix typo 2014-03-30 15:48:15 +00:00
Tim O'Guin
db6f276d01 added /var/run/salt to nonroot docs 2014-03-28 10:18:57 -05:00
Erik Johnson
5e1870d1c5 Add info on per-remote gitfs_base to master docs 2014-03-26 16:29:07 -05:00
Thomas S Hatch
21c4344f2e Clarify and update non-root documentation 2014-03-20 16:00:10 -06: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
Seth House
bf9ae06cc6 Removed old, scattered glossary entries 2014-02-27 19:38:56 -07:00
Jens Rantil
302629bc72 Fix typo: maintinance => maintenance 2014-02-27 14:59:24 +01:00
Mike Place
2637fc689f Docs build cleanly! Yay! 2014-02-26 13:32:33 -07:00
Mike Place
0ce328c7e7 Fix line length 2014-02-26 13:32:33 -07:00
Mike Place
fd15b3372b Now compiling cleanly except for GCE. 2014-02-26 13:32:33 -07:00
Mike Place
826bad4cfb Merge conflict and rebase.
Conflicts:
	doc/ref/renderers/index.rst
2014-02-26 13:32:08 -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
Mathieu Le Marec - Pasquet
11ff89000b Custom grains directories 2014-01-28 13:40:55 +01: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
3a6274fb3b Remove reference to yumpkg5 in provider override example
yumpkg5 is the default now, so it shouldn't be included in an example of
overriding the provider.
2013-12-09 14:16:19 -06: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
Thomas S Hatch
c0f6fd68a3 Merge pull request #8303 from basepi/rmcluster
Remove confusing "computer clusters" reference from docs
2013-11-06 15:11:17 -08:00
Colton Myers
79fe2637bf Remove confusing "computer clusters" reference from docs 2013-11-06 12:11:08 -07:00
Colton Myers
f50ebad1f5 Add publish example for limiting targets 2013-11-06 11:03:31 -07:00
Forrest Alvarez
a1b4848dbc Updated minion.rst with a note on verify env for issue 8281. 2013-11-06 05:41:56 +00: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
Joe Healy
aece0976a6 Fixed pedantic spelling errors picked up by lintian
joe@unstable-builder:~/salt_017rc/salt$ lintian -I ../*.deb
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz softwares software - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz specifed specified - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Targetting Targeting - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz targetted targeted - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz Dependant Dependent - done
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57301 /var/named/ - not done - example
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57320 /var/named/ - not done - example
I: salt-common: FSSTND-dir-in-manual-page usr/share/man/man7/salt.7.gz:57339 /var/named/ - not done - example
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz recieve receive - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz allows to allows one to - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz allows to allows one to - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz dont don't - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz succesfully successfully - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz softwares software - done
I: salt-common: spelling-error-in-manpage usr/share/man/man7/salt.7.gz These package This package - not done - legitimate
2013-09-20 22:01:20 +10:00
Pedro Algarvio
48990a4bc2 Don't show the module members, these can be considered internal. 2013-09-18 11:42:50 +01:00
Pedro Algarvio
931e0c4b05 Minor updates to include the external logging handler documentation. 2013-08-30 23:14:40 +01:00
Pedro Algarvio
f99d2a5065 Direct curious developers to the proper document. 2013-08-30 19:33:22 +00: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
f5f4caa852 Fix doctring code block syntax. 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
ce9b2728a0 Add documentation on how the minion id is derived 2013-08-15 18:03:38 -05: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
56fbf9cdbf Formatting fixes + added File Directory Settings
Added the configuration parameters made available with a local
fileclient.
2013-08-03 18:53:39 -05:00
Erik Johnson
f59cbc427f Formatting corrections 2013-08-03 18:53:05 -05:00
Pedro Algarvio
87472875fe Replace issue links with the :issue: extlink extension. 2013-08-02 01:04:57 +01:00
Erik Johnson
70e236d028 Docmentation tweaks in advance of 0.16.2 release 2013-07-31 20:43:37 -05:00
Tomé Duarte
7946bef5f3 Fix typo in pidfile code example. 2013-07-30 06:57:34 +01:00
Thomas L. Kula
54a0746b4e Backoff when minion fails to connect
NOTE: This is a potential change --- I haven't actually gotten a
test environment to try this out.

This adds a configuration option to the minion,
`acceptance_wait_time_max', that if set changes the acceptance
wait loop to add `acceptance_wait_time' seconds to the wait between
each iteration, up to this maximum value.

POTENTIAL FIX: Issue #5813
2013-07-27 16:51:38 -04:00
Pedro Algarvio
e46e81e1f2 Direct link to python's documentation regarding the LogRecord attributes. 2013-07-23 16:59:47 +01:00
Pedro Algarvio
868cfad2d0 Link minion.rst to time.strftime's python documentation. 2013-07-23 16:55:23 +01:00
Pedro Algarvio
70b57bd0a2 Link master.rst to time.strftime's python documentation. 2013-07-23 16:46:05 +01:00
Erik Johnson
a5627b0cc7 Tweak description of "id" minion config param 2013-07-20 21:14:59 -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
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
Seth House
370dc7881b Removed line numbers from master/minion conf file examples
This change is to lazily side-step Sphinx issues rendering code
alongside line numbers. Aligning the line numbers <td> with the code
<td> is dumb and I'd like to patch the HTMLWriter to output
Bootstrap-compatible <ol>'s instead.
2013-06-12 12:15:40 -06: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
Seth House
32c944c1e9 Changed syntax highlighting from ini to yaml since conf files are yaml 2013-01-11 14:27:09 -07:00
Seth House
f7663df9b6 Fixed paths to the master/minion conf files 2013-01-11 14:26:28 -07: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
Erik Johnson
6739eca926 cleanup for 8bb8143 2012-12-27 11:29:46 -06:00
Erik Johnson
8bb8143ee3 Add missing config params to minion conf docs
I noticed earlier tonight when I added some information to the "hacking"
docs that my "root_dir" and "sock_dir" links were not actually linking
to anything, and found that they were missing from the minion
configuration page. It turns out that there were a good many params that
hadn't made their way into the docs yet, so I added as many of them as
I could identify.
2012-12-26 22:58:35 -06:00
Erik Johnson
92ab669a1f Provider doc enhancements
1) Added an example for the minion config option "providers".

2) Cleaned up line widths on solaris install instructions, and added
   information on how to use pkgutil as the default package provider.

3) Since systemd is the default provider for Arch Linux now, I corrected
   the information in the "State Providers" page so that the example of
   overriding the service provider reflects the current state of the
   codebase.
2012-12-21 21:40:01 -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
Thomas S Hatch
ee0158ebe2 Add state_output option docs 2012-12-10 17:37:42 -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
Seth House
207c826cde Added providers config option to docs 2012-10-11 14:17:10 -06:00
Seth House
4246b27ff0 Fixed misc rST syntax errors 2012-10-04 18:52:51 -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
Sean Channel
974a7042ed add backup_mode to minion config and config reference 2012-09-21 18:48:41 -07:00
Aaron Tygart
892afaef7f Add Esky documentation 2012-09-12 00:23:31 -05:00
Aaron Tygart
c8cef428ca Add configuration documentation for esky
* Add example in minion configuration template
* Add details in minion configuration documentation
2012-09-11 22:44:00 -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
Andy Sykes
29c2763527 Fix documentation oops in 'include' option 2012-06-26 21:55:21 +01:00
Andy Sykes
df096d754f Documentation oops 2012-06-26 20:54:56 +01:00
Andy Sykes
fbbe74bb35 Bugfixes/documentation update for the 'include' option
Bugfixes:
- handle case where 'include' option has an empty value
- globs were not handled correctly
- warning issued if any include option fails to match any files; this
may be deliberate by the user, but it's there to catch the case where
someone typos the path

Documentation updated with a few examples of how to use it. Minion
template config file also updated with similar examples.
2012-06-26 20:53:27 +01: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
Seth House
6564683052 Updated legacy reference to the minion id as 'hostname' 2012-02-24 23:44:31 -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
Thomas S Hatch
cb80f70cdb Merge pull request #543 from rubic/develop
updated documentation for user, fixed configuration template links
2012-01-18 21:30:21 -08:00
Jeff Bauer
d67c7f5613 updated documentation for user, fixed configuration template links 2012-01-18 23:04:48 -06:00
Thomas S Hatch
f89e89d850 add docs for new config param cache_jobs 2012-01-18 00:04:14 -07:00
Seth House
b9dc071b45 Added host of reST fixes for the release 2012-01-15 22:54:23 -07:00
Thomas S Hatch
3e2ac7f81e fix copy/paste oversight 2012-01-13 20:04:28 -07:00
Thomas S Hatch
4ef171b6a2 Finish adding the contents of the minion configuration guide 2012-01-13 17:27:43 -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
4678e93b09 add some docs to the minion config manager 2012-01-13 14:17:54 -07:00
Thomas S Hatch
e9a69b1265 update config guide for the master 2012-01-13 12:35:56 -07:00
Markus Gattol
dcf2eab462 added missing whitespace after ,
Signed-off-by: Markus Gattol <markus.gattol@sunoano.org>
2011-11-15 10:37:06 +00: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
Erik Nolte
1ca58adb79 Fix spelling error: recieve -> receive 2011-07-27 17:46:53 -06:00
Thomas S Hatch
846ced7727 Fix typos in configuration docs 2011-06-24 22:38:27 -06:00
Thomas S Hatch
2924d7f58b Fix indentation and underlines 2011-06-22 20:55:35 -06:00
Thomas S Hatch
736f4d6963 fix code-block statements 2011-06-22 20:41:10 -06:00
Thomas S Hatch
acf80db54b Some updates on the configuration guide 2011-05-30 22:16:25 -06:00
Seth House
20f18681bd Added initial Sphinx documentation
This commit moves the existing wiki pages on Github into rST with only
minor edits, formatting, and hyperlinking.
2011-05-27 06:27:42 +08:00