Commit Graph

67 Commits

Author SHA1 Message Date
rallytime
49f40e9d99 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/conf.py
  - doc/topics/reactor/index.rst
  - tests/integration/__init__.py
2016-07-12 16:13:56 -06:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
2016-07-12 14:29:35 -06:00
Erik Johnson
ae38c874da Add a bunch of documentation on getting files from other environments (#34560)
* Remove :members: from fileserver docs pages

These functions can never be invoked directly from the CLI, so it is
pointless to include them in the documentation.

* Rename section

* Add docs page clarifying how to get files from different environments

* Add reminder that file_roots can be specified for masterless salt

* Link to the new environments page from the states tutorial

* Add information on pulling reactor configs from non-base environments

* Add examples of querystring syntax to cp module
2016-07-08 17:15:27 -04:00
rallytime
9d049e28e5 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/disk.py
2016-06-15 17:13:26 -06:00
Jacob Hammons
887a415138 Adds new Understanding Jinja topic, and fixes several Jinja doc issues.
Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability.

Refs #12470
Refs #10206
Refs #10480
Refs #23522
Refs #33023
2016-06-13 18:30:42 -06:00
rallytime
5952e3e300 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/mac_brew.py
  - salt/states/archive.py
2016-04-28 15:35:34 -06:00
rallytime
9033060106 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/states/archive.py
2016-04-28 14:22:58 -06:00
Nicole Thomas
f581a8218d Remove FileClient class references from docs - it doesn't exist. (#32925)
* Remove FileClient class references from docs - it doesn't exist.

Replace FileClient class references with mentions of the fileclient.py
module and replace code examples with salt.fileclient.get_file_client
examples.

Fixes #32646

* Don't reference minion import when not used
2016-04-28 14:14:40 -06:00
Nicole Thomas
9942ea9319 [develop] Merge forward from 2016.3 to develop (#32636)
* Ensure rh_service not used on CloudLinux 7

Add CloudLinux to RHEL-derived distros excluded from rh_service use in osrelease >= 7

* Fix binary search and replace (#32542)

* Don't return None from eval_master (#32555)

Raise an exception instead. Because eval master if returns should return
a tuple.

* redact passwords and hashes from user.present updates

Fixes #32381

* Better log message on minion restart if master couldn't be reached. (#32576)

* Revert PR #32480 and apply #32314 with fixes / documentation (#32558)

* Revert "Fix loop in maint.flo"

This reverts commit 5196cd6a6e5db3c7b1a47b1740881bbd3e87ea3d.

* Revert "Clear VCS fsbackend and git_pillar locks on master start"

This reverts commit 7e3caa9bae1ac4de62db9924374e35a8b826937e.

* Revert "Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks"

This reverts commit 4c2db32419022501eae2a695ec488693e043d189.

* prevent eternal gitfs lock due to process crash

* Use salt.utils.fopen() instead of open()

* Make pid locking work for more than just gitfs

Also, make logging more descriptive, to aid in troubleshooting.

* Add git_pillar_global_lock config option default value

* Document proper usage of {gitfs,git_pillar}_global_lock

* Fix comments value in salt.states.pkgrepo example (#32604)

'comments' option adds '#' automatically. Example contains `#http://mirror.centos.org/centos/$releasever/os/$basearch/` string which becomes prefixed with '##' in generated file.

* alphabetize directories for dynamic modules (#32599)

Also add engines and proxy minions to the list.

* Expand on the open-source vs open-core FAQ

* Language clarification.

* Fix some mistakes in the salt-ssh thin shell script (#32583)

* [[ is bash, not compatible with /bin/sh

* check if python command exists before calling it

* Deprecate 'user' and 'group' in state cmd (#32613)

* Remove unused 'group' argument

* Fix unit testing of cmd.mod_run_check without group arg

* Deprecate 'user/group' in cmd.run

* Deprecate 'user'/'group' in cmd.script

* Deprecate 'user' in cmd.wait

* Deprecate 'user'/'group' in cmd.wait_script

* Fix mod_run_check without 'group'

* Push deprecation back one release

* Fix mac_service and mac_system modules (#32587)

* Fix mac_service module

* Add integration tests for new functions

* Start will not enable the service beforehand

* Remove unused variables
2016-04-18 08:40:20 -06:00
Daniel Wallace
0b370d67b4 alphabetize directories for dynamic modules (#32599)
Also add engines and proxy minions to the list.
2016-04-15 08:58:19 -06:00
Justin Findlay
a21bad82e5 doc/ref/file_server/index.rst: remove env support 2016-02-16 19:26:57 -07:00
Jonathan Ballet
6922da46dc doc: fix warnings + some rendering issues 2015-12-21 13:26:02 +01:00
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
2015-09-29 14:56:41 -06:00
rallytime
105528720b Outputters should sync to output, not outputters, on the minion.
Otherwise, the loader won't pick them up.

Fixes #17103
2015-09-28 16:53:53 -06:00
Jacob Hammons
a9fdecada1 Fix css layout Refs #27389
sample typo fix in linux_acl
additional module folders listed in dynamic-modules
2015-09-25 11:25:14 -06:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
2015-06-09 11:41:07 -06:00
Jacob Hammons
d45c4ed11f Bug fixes and build errors
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
2015-06-05 17:32:35 -06:00
Seth House
4cb33c92d6 Added autodoc generated pages for the new modules types 2015-04-03 12:45:49 -06:00
Seth House
ef3893d4de Updated module index pages for each of the module types 2015-04-03 12:39:13 -06:00
Seth House
1382401618 Updated all the module index pages with the latest/newest modules 2015-03-02 13:59:19 -07:00
C. R. Oldham
c9610bc4f2 Merge commit, merge forward 2014.7 to 2015.2 2015-02-27 15:01:30 -07:00
Erik Johnson
4ce8a9d064 Improve salt fileserver documentation 2015-02-27 14:53:57 -07:00
Erik Johnson
db85cd43f7 Improve salt fileserver documentation 2015-02-24 22:37:30 -06:00
Thomas Jackson
f0aae727ce Comma cleanup 2014-12-12 11:39:07 -08:00
Thomas Jackson
f268bb8b4b Whitespace cleanup 2014-12-11 07:53:20 -08:00
Seth House
679f74198e Added link target for the module sync system 2014-06-09 19:31:38 -06:00
Erik Johnson
bfa3413f79 Improved wording for fileserver docs 2014-04-27 15:46:42 -05:00
Seth House
d2f057b0fd Combed through all the module types to add recent additions to the docs 2014-04-17 12:16:26 -06:00
Erik Johnson
bc850cfdd3 Add new docs RST autosummary page 2014-04-12 11:23:34 -05:00
Erik Johnson
c351f8b76e Add svnfs to toctree 2014-04-11 16:17:47 -05:00
Seth House
d4a71b2bc0 Added ref anchor for file server docs 2014-02-27 19:38:57 -07:00
Seth House
bf9ae06cc6 Removed old, scattered glossary entries 2014-02-27 19:38:56 -07:00
Mike Place
826bad4cfb Merge conflict and rebase.
Conflicts:
	doc/ref/renderers/index.rst
2014-02-26 13:32:08 -07:00
Mike Place
6af7ff5dff First pass at refactoring Salt documentation. 2014-02-26 13:31:11 -07:00
jeremyfelt
1562acfbb3 s/environmentt/environment/ in new documentation
Introduced in 85cbec9
2014-01-29 20:40:02 -08:00
Forrest Alvarez
c1d8fca8a5 Fixed a typo in the file_roots docs, 2014-01-29 20:52:08 +00:00
Forrest Alvarez
ff4a01d5ed Updated the file_roots docs to show an example using multiple file roots for different environments. 2014-01-29 20:51:03 +00:00
Erik Johnson
1c442f7c4e Add some links to the fileserver backends docs
This commit turns some of the config file parameters into links to the
master config file docs, and also links to the pages for the fileserver
backends being described.
2014-01-02 10:33:50 -06:00
Erik Johnson
4cb0faba5e Fix sphinx warning due to mismatched header lines 2014-01-01 16:34:54 -06:00
Amir Pakdel
ea3c23aa05 MinionFS fileserver backend
The backend for serving files pushed to master
by cp.push (file_recv).
2013-12-30 19:02:42 -05:00
shadowfax-chc
ae3d936644 Added reference docs for hgfs. 2013-08-26 17:42:52 -04:00
Seth House
95971d96d6 Added docs for each fileserver module 2013-08-14 17:19:56 -06:00
Seth House
73c11e298f Added fileserver modules to docs & index 2013-08-14 17:00:09 -06:00
Gary Wilson Jr
bd499e5640 Fixed several minor misspellings and acronym capitalizations. 2013-03-18 16:42:57 -05:00
Thomas S Hatch
3369f1431a Add fileserver backend docs 2013-01-01 16:58:12 -07:00
Ryan Schneider
2ccf589425 Refactor: make_dirs -> makedirs, gzip_compression -> gzip 2012-11-14 18:06:53 -08:00
Ryan Schneider
ad1a43012a Add gzip and template to cp.get_dir, expose make_dirs on cp.get_file 2012-11-14 16:48:26 -08:00
Thomas S Hatch
537e9141e2 fix small typo 2012-11-08 18:52:09 -07:00
Ryan Schneider
c638617612 Add gzip_compression support to cp.get_file 2012-11-08 16:09:38 -08:00
Ryan Schneider
deaf32b877 Add template rendering to cp.get_file src/dest 2012-11-06 19:36:51 -08:00