valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
101,719 Commits 24 Branches 182 Tags 341 MiB
326f9f4d27
Commit Graph

293 Commits

Author SHA1 Message Date
Felix Dreissig
5b55fb2452 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-05-09 11:10:29 -06:00
Vitali Quiering
91f2963922 Add logstash engine protocol to manual 2017-03-24 17:03:22 +01:00
John Kristensen
8e92152533 Add key_text option to apt pkgrepo.managed (closes #37936) 
It may not always possible or desirable to upload a GPG key to a
keyserver (`keyid`/`keyserver`) or to host it on remote server
(`key_url`). This just leaves storing the key in a state using a
`salt://` URL.

It seems like the states is the wrong place to hold this sort of data,
and would be more suited to being in the pillar.

Adding a `key_text` option to the apt `pkgrepo.managed` module, which
accepts a GPG key in string form, can assist in importing a GPG key from
pillar data.
 2017-03-16 00:25:21 +11:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
Mike Place
cbd66a0d3f Merge pull request #39676 from F30/hash-comment 
Fix comments about the "hash_type" option
 2017-02-27 13:11:40 -07:00
Felix Dreissig
5371bc0996 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-02-26 23:24:54 +01:00
Felix Dreissig
78a185ab11 Fix comments about file backup directory 
The actual file state backup directory is called "file_backup" without a
trailing 's'.
 2017-02-26 22:49:29 +01:00
rallytime
c46f82c029 Merge branch '2016.11' into 'develop' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
 2017-02-21 14:20:20 -07:00
Cory Wright
cc90d0d53f The Reactor docs should use pillar='{}' instead of 'pillar={}' 2017-02-17 11:07:39 -06:00
Jean-Claude Computing
94f349a900 Fix documentation for detach's default value 2017-02-15 20:29:29 +01:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
 2016-11-10 15:59:51 -07:00
Ronald van Zantvoort
cb445550a6 typofix 2016-11-08 01:13:12 +01:00
Ronald van Zantvoort
ae4e86ccc2 modify docs to utilize backend:requests 2016-11-07 22:28:32 +01:00
rallytime
e57fb947c6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/status.py
 2016-11-01 12:56:04 -06:00
Nicole Thomas
5328bc8d99 Update man pages for 2016.11 (#37354) 2016-10-31 13:09:01 -06:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
 2016-10-28 11:58:41 -06:00
rallytime
0df3feec3c Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-28 09:25:00 -06:00
Nicole Thomas
47290d88a2 Update man pages for the 2016.3 branch (#37259) 2016-10-26 13:32:38 -06:00
Mike Place
76562d2c4e Merge pull request #36647 from MTecknology/develop 
Documentation Updates: reactor/orchestrator/git_fileserver
 2016-09-30 19:22:33 +09:00
Michael Lustfield
58da3da949 Missed that the correct link gets created; yay sphinxdoc 2016-09-28 13:43:02 -07:00
Michael Lustfield
6d93b2a367 Adding quotes to help identify this is a document title; would link if this was not a man page 2016-09-28 13:22:02 -07:00
Michael Lustfield
41e07a78a1 Making an attempt to clarify a few things in the salt.fileserver.gitfs section 2016-09-28 13:19:59 -07:00
Aneesh Agrawal
ffb717fec3 archive.extracted: Use user/group, not archive_user 
Ensure that any created parent directories are made with `user`/`group`
perms, not as the `archive_user` user. This also allows setting the
group for these dirs instead of defaulting to `root`.

The `archive_user` argument to archive.extracted has been deprecated
since version 2014.7.2, and supplanted by the `user` parameter in
2015.8.0, with a logged warning until Boron. Now that 2016.3.0 is out,
complete the deprecation by:
- no longer silently using `archive_user` in `archive.extracted`,
  preferring instead `user` and `group`,
- no longer accepted `archive_user` as an argument.

Also update man page.
 2016-09-28 10:14:59 -06:00
Pavel Chechetin
6b917bb0b6 Fix 'if if' pattern in docs and comments 2016-09-28 13:12:44 +03:00
Aneesh Agrawal
4a9568d0b0 archive.extracted: Use user/group, not archive_user 
Ensure that any created parent directories are made with `user`/`group`
perms, not as the `archive_user` user. This also allows setting the
group for these dirs instead of defaulting to `root`.

The `archive_user` argument to archive.extracted has been deprecated
since version 2014.7.2, and supplanted by the `user` parameter in
2015.8.0, with a logged warning until Boron. Now that 2016.3.0 is out,
complete the deprecation by:
- no longer silently using `archive_user` in `archive.extracted`,
  preferring instead `user` and `group`,
- no longer accepted `archive_user` as an argument.

Also update man page.
 2016-09-23 23:41:45 -04:00
rallytime
d5bbd91c14 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - conf/master
 2016-09-23 17:01:17 -06:00
Nicole Thomas
5548ed771d Back-port #36435 to 2016.3 (#36532) 
* Added "none" option for pillar_source_merging_strategy

* added none to merging strategy in dictupdate so we no longer log warnings when it is selected

* Updated documentation

* fix for when pillar_source_merging_strategy is not set

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry

* Let's not break when no merging strategy is passed

* Capitalisation

* Update on doc
 2016-09-23 13:36:23 -06:00
Yoram Hekma
1f354783e7 Capitalisation 2016-09-21 17:34:09 +02:00
Yoram Hekma
6becc0d1e7 Updated documentation 2016-09-20 11:05:17 +02:00
Duncan Mac-Vicar P
9bfb3d85f1 add links to (open)SUSE family of images and build generation tools 2016-07-31 10:37:18 +02:00
Mike Place
1534b143e2 Merge pull request #34772 from kerick/ddns-port-work 
ddns: Add support for user defined nameserver port/TSIG key algorithm
 2016-07-27 12:05:40 -06:00
Jayson Cofell
9c330fe492 Fix port arguments 2016-07-20 06:29:56 -05:00
Jayson Cofell
7756d7af5e Modify port argument position/documentation 2016-07-19 13:28:12 -05:00
rallytime
39bc093ee9 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-19 10:31:07 -06:00
Jacob Hammons
c3ae64c054 Updates man pages (#34756) 
adds link to all tutorials to using salt section
Refs #33923
 2016-07-18 15:36:50 -06:00
Jayson Cofell
fc6409b69a Update ddns runner documention for port, TSIG key algorithm, and timeout 2016-07-18 15:18:55 -05:00
Jayson Cofell
90e1f514e1 Update ddns module documentation 2016-07-18 15:11:58 -05:00
Metin de Vreugd
d1769fb64f Add timeout to ddns execution module and runner 2016-06-20 11:08:10 +02:00
Adam Chainz
64d9a62f89 Convert readthedocs links for their .org -> .io migration for hosted projects 
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
 2016-06-11 12:33:37 +01:00
rallytime
f078d57b57 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/modules/win_servermanager.py
  - salt/state.py
  - salt/states/boto_s3_bucket.py
  - salt/states/pip_state.py
  - salt/states/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
  - tests/unit/states/dockerng_test.py
 2016-06-09 13:06:10 -06:00
Dan Slimmon
ea3498aedc Fixed spelling of "through" 2016-06-04 03:08:22 +00:00
Elias Probst
646bc426c6
Typo (privilages → privileges) 2016-06-03 09:54:56 +02:00
EYJ
beea8cc376 Fix millisecond formatting to avoid 1000 as four-digit milliseconds 2016-06-02 17:43:27 +02:00
Drew Adams
f15ce68097 change OpenSuse to openSUSE 2016-05-26 22:11:20 -07:00
Drew Adams
bcd6a1cd77 fix osfamily from Suse to SUSE 2016-05-26 22:08:40 -07:00
rallytime
7bf9f5d0f5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/man/salt.7
  - doc/ref/executors/all/salt.executors.direct_call.rst
  - doc/ref/executors/all/salt.executors.splay.rst
  - doc/ref/executors/all/salt.executors.sudo.rst
  - salt/cloud/clouds/vultrpy.py
 2016-05-18 09:40:48 -06:00
jacobhammons
7e95127467 man pages updated (#33307) 
sphinx build fixes
doc additions for new modules including thorium
 2016-05-17 10:24:44 -06:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
 2016-03-02 13:48:11 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
Kris Raney
afa297e4d1 Add pillar_roots_override_ext_pillar option and deprecate ext_pillar_first 2016-02-25 10:17:39 -06:00
Zach Malone
271c44667d Fixing typos, many examples in here still don't work (ex. salt -t 15 '*' gpg.create_key throws errors), but some low hanging fruit is fixed. 2016-02-09 15:44:51 -07:00
Justin Findlay
543f0ca712 doc, conf, pkg: VMWare -> VMware 2016-02-03 14:27:28 -07:00
Jacob Hammons
fca119fe80 Updated man pages, version to 2015.8.4, added CVE 2016-1866 to release notes 2016-02-02 13:04:34 -07:00
Daniel Wendler
e38f1fba3f Renaming salt-ssh option and documentation fix 
For consistency the wipe_ssh option is renamed in ssh_wipe as all other
options in the salt-ssh command are in this style.
The documentation was also adjusted to reflect the renaming.
There were also an wrong salt-ssh example in the documentation.
 2016-01-26 08:36:13 +01:00
Jacob Ward
40d9e6f505 Fixes #30569 2016-01-23 16:47:40 -07:00
Jacob Hammons
891ddafcba Updated man pages for 2015.8.4, updated copyright to 2016 2016-01-14 16:17:27 -07:00
Akhter Ali
abe16e0b9f Fixing typo 2015-12-09 16:48:14 -05:00
rallytime
cded9ac01d Merge branch '2015.8' into 'develop' 
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
 2015-11-06 09:34:31 -07:00
Daniel Hahler
eaf27d6ee7 doc: fix typo with salt.states.file: s/preseve/preserve/ 2015-11-04 23:29:37 +01:00
Dmitry Kuzmenko
7a5204ef02 Deprecate client_acl with publisher_acl (rename) 
Keeping client_acl support
 2015-10-23 11:59:40 +03:00
Thayne Harbaugh
7f8d5a56d1 Improve documentation of check_cmd. 
* Make the distinction between requisite `check_cmd` and `file.managed`
  `check_cmd`.

* Be more clear about `file.managed` `check_cmd`, the temporary file,
  and when the new contents are written or discarded.

* In requisite `check_cmd` use a concise `!` rather than the awkward
  `&& exit 1 || exit 0`.

* A few minor, stylistic changes.
 2015-10-20 13:44:06 -06:00
Jacob Hammons
cc37dc1087 updated version in salt.7 2015-09-30 13:01:11 -06:00
Jacob Hammons
a9dcb23a13 regenerated man pages for 2015.8.1 2015-09-30 12:58:34 -06:00
Justin Findlay
8ea15f498e 2015.2,2015.8,Beryllium -> 2015.8.0 
Some features were erroneously reported as being added in 2015.2.
 2015-09-18 16:35:15 -06:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
Jacob Hammons
701f47a658 Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py 
Added salt-proxy release notes topic
Added note to pip state for Refs #21845
Regenerated and versioned man pages
 2015-09-01 17:09:35 -06:00
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -06:00
C. R. Oldham
2de9672e95 Doc updates 2015-08-14 11:52:19 -06:00
Colton Myers
d8c5dfb33f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-30 16:58:19 -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
Petr Demin
a80c47ee10 Fixed typo in salt.states.saltmod.function doc string 2015-07-30 09:27:14 -06:00
Jacob Hammons
0e02191f61 regenerated man pages 2015-07-29 10:24:47 -06:00
Petr Demin
404f22f09f Fixed typo in salt.states.saltmod.function doc string 2015-07-29 16:48:44 +03:00
Alexey Pakseykin
c33eb813ea Change docs for --static option with JSON - text B 2015-07-27 09:00:59 -06:00
Alexey Pakseykin
89dd2ec8fb Change docs for --static option with JSON - text A 2015-07-27 09:00:59 -06:00
Alexey Pakseykin
454b7b5815 Change docs for --static option with JSON - text B 2015-07-25 23:39:50 +08:00
Alexey Pakseykin
39d45ec691 Change docs for --static option with JSON - text A 2015-07-25 23:37:49 +08:00
Ben Brady
a6bbfbfe8e return will not work in the context it is being used in - docs are misleading 2015-07-14 14:13:03 -07:00
Jacob Hammons
0a46dc4c40 Built man page for spm, added man page entry for spm to doc/conf.py 
Refs #25213
 2015-07-07 20:48:58 -06:00
Jacob Hammons
98d7867957 Built man page for spm, added man page entry for spm to doc/conf.py 
Refs #25213
 2015-07-07 16:54:26 -06:00
Jacob Hammons
cf97a4ab17 Updated man pages 2015-06-26 12:21:26 -06:00
Jacob Hammons
30a907576c rebuilt man pages, versioned html theme css 2015-06-26 11:06:21 -06:00
Julien Barbot
6d7e779e62 Fix typo in salt-cloud reactor section 2015-06-24 16:40:32 +02:00
Aneesh Agrawal
82a4794e0f Do not reference serializers from aggregation docs. 2015-05-28 20:04:20 -04:00
Aneesh Agrawal
4b9311507c Add new module type for serializers from issue #22257. 
Move existing serializers from salt.utils.serializers to
salt.serializers.
 2015-05-28 20:03:11 -04:00
Paul Theodoropoulos
f7f002daf5 Removed link to github page that no longer exists. 2015-05-13 17:27:44 -07:00
Markus "Shorty" Uckelmann
61eab1e156 How to still use existing $PATH in "cmd" modules 
Enhances #21840

Added a code example on how to still use the existing $PATH environment
variables in cmd modules. The code was taken from a mail from Ethan
Erchinger to the salt-users list.
 2015-05-12 12:00:03 +02: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
Erik Johnson
d6b62f73a4 Update manpages to reflect 2015.2 rename to 2015.5 2015-05-06 11:13:13 -06:00
Erik Johnson
0504e7a184 Update Lithium docstrings in 2015.2 branch 2015-05-06 11:01:53 -06:00
Vladimir Pouzanov
921aaea9b4 Fixed a Runenr typo in the docs 2015-05-03 18:47:15 +01:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
 2015-04-27 10:28:53 -06:00
Colton Myers
a18e017619 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/man/salt.1
    doc/ref/cli/salt.rst
 2015-04-24 10:07:48 -06:00
Jonathan Ballet
19efd419b5 Improve state_output documentation 
List all the available settings in the documentation and on the command
line.
Also, make the documentation clearer about the different possibilities.
 2015-04-23 10:22:11 +02:00
Colton Myers
1a38b4b834 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/cli/salt.py
    salt/client/mixins.py
    salt/renderers/pyobjects.py
 2015-04-22 11:07:01 -06:00
Jacob Hammons
99abfd7755 Regenerated man pages 2015-04-21 11:33:30 -06:00
Jacob Hammons
32ef5ca397 Revert "Regenerated man pages" 
This reverts commit 069a0cac71.
 2015-04-21 11:27:31 -06:00
Jacob Hammons
069a0cac71 Regenerated man pages 2015-04-21 11:20:52 -06:00
Colton Myers
66378be75e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/states/requisites.rst
    salt/master.py
    salt/modules/win_pkg.py
 2015-04-16 12:27:53 -06:00