mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #39617 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
This commit is contained in:
Nicole Thomas
GitHub
commit
e9410fb669
3 changed files with 21 additions and 71 deletions
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"skipTitle": "Merge forward",
|
||||
"delayed": true,
|
||||
"delayedUntil": "2h"
|
||||
"delayedUntil": "2h",
|
||||
"userBlacklist": []
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -419,3 +419,14 @@ and bug resolution. See the :ref:`Labels and Milestones
|
|||
.. _`Closing issues via commit message`: https://help.github.com/articles/closing-issues-via-commit-messages
|
||||
.. _`git format-patch`: https://www.kernel.org/pub/software/scm/git/docs/git-format-patch.html
|
||||
.. _salt-users: https://groups.google.com/forum/#!forum/salt-users
|
||||
|
||||
Mentionbot
|
||||
==========
|
||||
|
||||
SaltStack runs a mention-bot which notifies contributors who might be able
|
||||
to help review incoming pull-requests based on their past contribution to
|
||||
files which are being changed.
|
||||
|
||||
If you do not wish to receive these notifications, please add your GitHub
|
||||
handle to the blacklist line in the `.mention-bot` file located in the
|
||||
root of the Salt repository.
|
||||
|
|
|
|||
|
|
@ -1166,7 +1166,7 @@ def managed(name,
|
|||
will not be changed or managed.
|
||||
|
||||
If the file is hosted on a HTTP or FTP server then the source_hash
|
||||
argument is also required
|
||||
argument is also required.
|
||||
|
||||
A list of sources can also be passed in to provide a default source and
|
||||
a set of fallbacks. The first source in the list that is found to exist
|
||||
|
|
@ -3433,7 +3433,7 @@ def blockreplace(
|
|||
will not be changed or managed.
|
||||
|
||||
If the file is hosted on a HTTP or FTP server then the source_hash
|
||||
argument is also required
|
||||
argument is also required.
|
||||
|
||||
A list of sources can also be passed in to provide a default source and
|
||||
a set of fallbacks. The first source in the list that is found to exist
|
||||
|
|
@ -3442,7 +3442,8 @@ def blockreplace(
|
|||
.. code-block:: yaml
|
||||
|
||||
file_override_example:
|
||||
file.managed:
|
||||
file.blockreplace:
|
||||
- name: /etc/example.conf
|
||||
- source:
|
||||
- salt://file_that_does_not_exist
|
||||
- salt://file_that_exists
|
||||
|
|
@ -3467,45 +3468,8 @@ def blockreplace(
|
|||
sha1 40
|
||||
md5 32
|
||||
|
||||
**Using a Source Hash File**
|
||||
The file can contain several checksums for several files. Each line
|
||||
must contain both the file name and the hash. If no file name is
|
||||
matched, the first hash encountered will be used, otherwise the most
|
||||
secure hash with the correct source file name will be used.
|
||||
|
||||
When using a source hash file the source_hash argument needs to be a
|
||||
url, the standard download urls are supported, ftp, http, salt etc:
|
||||
|
||||
Example:
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
tomdroid-src-0.7.3.tar.gz:
|
||||
file.managed:
|
||||
- name: /tmp/tomdroid-src-0.7.3.tar.gz
|
||||
- source: https://launchpad.net/tomdroid/beta/0.7.3/+download/tomdroid-src-0.7.3.tar.gz
|
||||
- source_hash: https://launchpad.net/tomdroid/beta/0.7.3/+download/tomdroid-src-0.7.3.hash
|
||||
|
||||
The following is an example of the supported source_hash format:
|
||||
|
||||
.. code-block:: text
|
||||
|
||||
/etc/rc.conf ef6e82e4006dee563d98ada2a2a80a27
|
||||
sha254c8525aee419eb649f0233be91c151178b30f0dff8ebbdcc8de71b1d5c8bcc06a /etc/resolv.conf
|
||||
ead48423703509d37c4a90e6a0d53e143b6fc268
|
||||
|
||||
Debian file type ``*.dsc`` files are also supported.
|
||||
|
||||
**Inserting the Source Hash in the sls Data**
|
||||
Examples:
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
tomdroid-src-0.7.3.tar.gz:
|
||||
file.managed:
|
||||
- name: /tmp/tomdroid-src-0.7.3.tar.gz
|
||||
- source: https://launchpad.net/tomdroid/beta/0.7.3/+download/tomdroid-src-0.7.3.tar.gz
|
||||
- source_hash: md5=79eef25f9b0b2c642c62b7f737d4f53f
|
||||
See the ``source_hash`` parameter description for :mod:`file.managed
|
||||
<salt.states.file.managed>` function for more details and examples.
|
||||
|
||||
template
|
||||
The named templating engine will be used to render the downloaded file.
|
||||
|
|
@ -3946,34 +3910,8 @@ def append(name,
|
|||
sha1 40
|
||||
md5 32
|
||||
|
||||
The file can contain several checksums for several files. Each line
|
||||
must contain both the file name and the hash. If no file name is
|
||||
matched, the first hash encountered will be used, otherwise the most
|
||||
secure hash with the correct source file name will be used.
|
||||
|
||||
Debian file type ``*.dsc`` is supported.
|
||||
|
||||
Examples:
|
||||
|
||||
.. code-block:: text
|
||||
|
||||
/etc/rc.conf ef6e82e4006dee563d98ada2a2a80a27
|
||||
sha254c8525aee419eb649f0233be91c151178b30f0dff8ebbdcc8de71b1d5c8bcc06a /etc/resolv.conf
|
||||
ead48423703509d37c4a90e6a0d53e143b6fc268
|
||||
|
||||
Known issues:
|
||||
If the remote server URL has the hash file as an apparent
|
||||
sub-directory of the source file, the module will discover that it
|
||||
has already cached a directory where a file should be cached. For
|
||||
example:
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
tomdroid-src-0.7.3.tar.gz:
|
||||
file.managed:
|
||||
- name: /tmp/tomdroid-src-0.7.3.tar.gz
|
||||
- source: https://launchpad.net/tomdroid/beta/0.7.3/+download/tomdroid-src-0.7.3.tar.gz
|
||||
- source_hash: https://launchpad.net/tomdroid/beta/0.7.3/+download/tomdroid-src-0.7.3.tar.gz/+md5
|
||||
See the ``source_hash`` parameter description for :mod:`file.managed
|
||||
<salt.states.file.managed>` function for more details and examples.
|
||||
|
||||
template
|
||||
The named templating engine will be used to render the appended-to file.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue