mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Various Link Redirect and HTTP/HTTPS Fixes in docs (#56655)
* Fixing various redirected links * Change links to https * Reintroduced macro link reference * Change man page to original at master; revert added line
This commit is contained in:
parent
3deb61c5ec
commit
5a73ef699f
70 changed files with 166 additions and 166 deletions
|
@ -7,4 +7,4 @@ following the :ref:`installation` and the
|
|||
There are many ways to :ref:`get help from the Salt community
|
||||
<salt-community>` including our
|
||||
`mailing list <https://groups.google.com/forum/#!forum/salt-users>`_
|
||||
and our `IRC channel <http://webchat.freenode.net/?channels=salt>`_ #salt.
|
||||
and our `IRC channel <https://webchat.freenode.net/#salt>`_ #salt.
|
2
doc/_themes/saltstack2/layout.html
vendored
2
doc/_themes/saltstack2/layout.html
vendored
|
@ -351,7 +351,7 @@
|
|||
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="view the latest saltstack tweets" href="http://twitter.com/saltstackinc" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/twitter.png', 1) }}" ></a></li>
|
||||
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="subscribe to the salt users mailing list" href="https://groups.google.com/forum/#!forum/salt-users" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/email.png', 1) }}" ></a></li>
|
||||
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="download saltstack code from github" href="https://github.com/saltstack/salt" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/github.png', 1) }}" ></a></li>
|
||||
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="chat in #salt on freenode irc" href="http://webchat.freenode.net/?channels=salt&uio=mj10cnvljjk9dhj1zsyxmd10cnvl83" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/messenger-generic.png', 1) }}" ></a></li>
|
||||
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="chat in #salt on freenode irc" href="https://webchat.freenode.net/#salt" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/messenger-generic.png', 1) }}" ></a></li>
|
||||
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="/r/saltstack" href="http://www.reddit.com/r/saltstack/" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/reddit.png', 1) }}" ></a></li>
|
||||
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="ask a saltstack question on stackoverflow" href="http://stackoverflow.com/questions/tagged/salt-stack" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/stackoverflow.png', 1) }}" ></a></li>
|
||||
<li><a data-container="body" data-delay='{ "show": 500, "hide": 100 }' data-toggle="tooltip" data-placement="top" title="join or start a saltstack meetup" href="http://www.meetup.com/find/?keywords=saltstack" target="_blank"><img class="nolightbox" width="24" src="{{ pathto('_static/images/meetup.png', 1) }}" ></a></li>
|
||||
|
|
|
@ -21,7 +21,7 @@ class Mock(object):
|
|||
|
||||
This Mock class can be configured to return a specific values at specific names, if required.
|
||||
|
||||
http://read-the-docs.readthedocs.org/en/latest/faq.html#i-get-import-errors-on-libraries-that-depend-on-c-modules
|
||||
https://read-the-docs.readthedocs.io/en/latest/faq.html#i-get-import-errors-on-libraries-that-depend-on-c-modules
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
|
@ -504,8 +504,8 @@ linkcheck_ignore = [
|
|||
r"http://123.456.789.012:\d+",
|
||||
r"http://localhost",
|
||||
r"https://groups.google.com/forum/#!forum/salt-users",
|
||||
r"http://logstash.net/docs/latest/inputs/udp",
|
||||
r"http://logstash.net/docs/latest/inputs/zeromq",
|
||||
r"https://www.elastic.co/logstash/docs/latest/inputs/udp",
|
||||
r"https://www.elastic.co/logstash/docs/latest/inputs/zeromq",
|
||||
r"http://www.youtube.com/saltstack",
|
||||
r"https://raven.readthedocs.io",
|
||||
r"https://getsentry.com",
|
||||
|
|
|
@ -1796,7 +1796,7 @@ Default: ``None``
|
|||
TLS/SSL connection options. This could be set to a dictionary containing
|
||||
arguments corresponding to python ``ssl.wrap_socket`` method. For details see
|
||||
`Tornado <http://www.tornadoweb.org/en/stable/tcpserver.html#tornado.tcpserver.TCPServer>`_
|
||||
and `Python <http://docs.python.org/2/library/ssl.html#ssl.wrap_socket>`_
|
||||
and `Python <https://docs.python.org/2/library/ssl.html#ssl.wrap_socket>`_
|
||||
documentation.
|
||||
|
||||
Note: to set enum arguments values like ``cert_reqs`` and ``ssl_version`` use
|
||||
|
@ -2177,7 +2177,7 @@ To set the options for sls templates use :conf_master:`jinja_sls_env`.
|
|||
|
||||
.. note::
|
||||
|
||||
The `Jinja2 Environment documentation <http://jinja.pocoo.org/docs/api/#jinja2.Environment>`_ is the official source for the default values.
|
||||
The `Jinja2 Environment documentation <https://jinja.palletsprojects.com/en/2.11.x/api/#jinja2.Environment>`_ is the official source for the default values.
|
||||
Not all the options listed in the jinja documentation can be overridden using :conf_master:`jinja_env` or :conf_master:`jinja_sls_env`.
|
||||
|
||||
The default options are:
|
||||
|
|
|
@ -2895,7 +2895,7 @@ Default: ``None``
|
|||
TLS/SSL connection options. This could be set to a dictionary containing
|
||||
arguments corresponding to python ``ssl.wrap_socket`` method. For details see
|
||||
`Tornado <http://www.tornadoweb.org/en/stable/tcpserver.html#tornado.tcpserver.TCPServer>`_
|
||||
and `Python <http://docs.python.org/2/library/ssl.html#ssl.wrap_socket>`_
|
||||
and `Python <https://docs.python.org/2/library/ssl.html#ssl.wrap_socket>`_
|
||||
documentation.
|
||||
|
||||
Note: to set enum arguments values like ``cert_reqs`` and ``ssl_version`` use
|
||||
|
|
|
@ -37,5 +37,5 @@ Execution Module Used for
|
|||
:py:mod:`~salt.modules.zypperpkg` SUSE-based distros using ``zypper(8)``
|
||||
====================================== ========================================
|
||||
|
||||
.. _Homebrew: http://brew.sh/
|
||||
.. _OpenCSW: http://www.opencsw.org/
|
||||
.. _Homebrew: https://brew.sh/
|
||||
.. _OpenCSW: https://www.opencsw.org/
|
||||
|
|
|
@ -37,7 +37,7 @@ the loader knows that the module needs to be imported as a Cython module. The
|
|||
compilation of the Cython module is automatic and happens when the minion
|
||||
starts, so only the ``*.pyx`` file is required.
|
||||
|
||||
.. _`Cython`: http://cython.org/
|
||||
.. _`Cython`: https://cython.org/
|
||||
|
||||
Zip Archives as Modules
|
||||
=======================
|
||||
|
|
|
@ -338,7 +338,7 @@ The output is:
|
|||
Total: 2
|
||||
|
||||
|
||||
.. _`pip`: https://pypi.python.org/pypi/pip
|
||||
.. _`pep8`: https://pypi.python.org/pypi/pep8
|
||||
.. _`setuptools`: https://pypi.python.org/pypi/setuptools
|
||||
.. _`pip`: https://pypi.org/project/pip/
|
||||
.. _`pep8`: https://pypi.org/project/pep8/
|
||||
.. _`setuptools`: https://pypi.org/project/setuptools/
|
||||
.. _`runners`: /ref/runners
|
||||
|
|
|
@ -247,8 +247,8 @@ Once the profile is created, you can use the **PROFILE_NAME** to configure
|
|||
your cloud profiles.
|
||||
|
||||
.. _`IAM Management Console`: https://console.aws.amazon.com/iam/home?#roles
|
||||
.. _`AWS CLI`: http://docs.aws.amazon.com/cli/latest/index.html
|
||||
.. _`instance profile`: http://docs.aws.amazon.com/IAM/latest/UserGuide/instance-profiles.html
|
||||
.. _`AWS CLI`: https://docs.aws.amazon.com/cli/latest/index.html
|
||||
.. _`instance profile`: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2_instance-profiles.html
|
||||
|
||||
|
||||
Cloud Profiles
|
||||
|
@ -457,7 +457,7 @@ EC2 instances can be added to an `AWS Placement Group`_ by specifying the
|
|||
my-ec2-config:
|
||||
placementgroup: my-aws-placement-group
|
||||
|
||||
.. _`AWS Placement Group`: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html
|
||||
.. _`AWS Placement Group`: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html
|
||||
|
||||
Your instances may optionally make use of EC2 Spot Instances. The
|
||||
following example will request that spot instances be used and your
|
||||
|
@ -627,8 +627,8 @@ Tags can be set once an instance has been launched.
|
|||
tag0: value
|
||||
tag1: value
|
||||
|
||||
.. _`AWS documentation`: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html
|
||||
.. _`AWS Spot Instances`: http://aws.amazon.com/ec2/purchasing-options/spot-instances/
|
||||
.. _`AWS documentation`: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html
|
||||
.. _`AWS Spot Instances`: https://aws.amazon.com/ec2/spot/
|
||||
|
||||
Setting up a Master inside EC2
|
||||
------------------------------
|
||||
|
@ -766,7 +766,7 @@ them have never been used, much less tested, by the Salt Stack team.
|
|||
|
||||
* `CentOS`__
|
||||
|
||||
.. __: http://wiki.centos.org/Cloud/AWS
|
||||
.. __: https://wiki.centos.org/Cloud/AWS
|
||||
|
||||
* `Ubuntu`__
|
||||
|
||||
|
@ -778,7 +778,7 @@ them have never been used, much less tested, by the Salt Stack team.
|
|||
|
||||
* `OmniOS`__
|
||||
|
||||
.. __: http://omnios.omniti.com/wiki.php/Installation#IntheCloud
|
||||
.. __: https://omniosce.org/setup/aws.html
|
||||
|
||||
* `All Images on Amazon`__
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ More information about Azure is located at `http://www.windowsazure.com/
|
|||
|
||||
Dependencies
|
||||
============
|
||||
* `Microsoft Azure SDK for Python <https://pypi.python.org/pypi/azure/1.0.2>`_ >= 1.0.2
|
||||
* `Microsoft Azure SDK for Python <https://pypi.org/project/azure/1.0.2>`_ >= 1.0.2
|
||||
* The python-requests library, for Python < 2.7.9.
|
||||
* A Microsoft Azure account
|
||||
* OpenSSL (to generate the certificates)
|
||||
|
@ -640,7 +640,7 @@ on creating management certificates, see the following link:
|
|||
|
||||
* `Create and Upload a Management Certificate for Azure`__
|
||||
|
||||
.. __: https://msdn.microsoft.com/en-us/library/azure/gg551722.aspx
|
||||
.. __: https://docs.microsoft.com/en-us/azure/cloud-services/cloud-services-certs-create
|
||||
|
||||
The following options are available.
|
||||
|
||||
|
@ -765,7 +765,7 @@ following article for an explanation of this option.
|
|||
|
||||
* `Load Balancing for Azure Infrastructure Services`__
|
||||
|
||||
.. __: http://azure.microsoft.com/en-us/documentation/articles/virtual-machines-load-balance/
|
||||
.. __: https://docs.microsoft.com/en-us/azure/load-balancer/load-balancer-overview
|
||||
|
||||
timeout_for_tcp_idle_connection
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
@ -774,7 +774,7 @@ explanation of this option.
|
|||
|
||||
* `Configurable Idle Timeout for Azure Load Balancer`__
|
||||
|
||||
.. __: http://azure.microsoft.com/blog/2014/08/14/new-configurable-idle-timeout-for-azure-load-balancer/
|
||||
.. __: https://azure.microsoft.com/en-us/blog/new-configurable-idle-timeout-for-azure-load-balancer/
|
||||
|
||||
CLI Example
|
||||
~~~~~~~~~~~
|
||||
|
|
|
@ -15,16 +15,16 @@ More information about Azure is located at `http://www.windowsazure.com/
|
|||
|
||||
Dependencies
|
||||
============
|
||||
* `azure <https://pypi.python.org/pypi/azure>`_ >= 2.0.0rc6
|
||||
* `azure-common <https://pypi.python.org/pypi/azure-common>`_ >= 1.1.4
|
||||
* `azure-mgmt <https://pypi.python.org/pypi/azure-mgmt>`_ >= 0.30.0rc6
|
||||
* `azure-mgmt-compute <https://pypi.python.org/pypi/azure-mgmt-compute>`_ >= 0.33.0
|
||||
* `azure-mgmt-network <https://pypi.python.org/pypi/azure-mgmt-network>`_ >= 0.30.0rc6
|
||||
* `azure-mgmt-resource <https://pypi.python.org/pypi/azure-mgmt-resource>`_ >= 0.30.0
|
||||
* `azure-mgmt-storage <https://pypi.python.org/pypi/azure-mgmt-storage>`_ >= 0.30.0rc6
|
||||
* `azure-mgmt-web <https://pypi.python.org/pypi/azure-mgmt-web>`_ >= 0.30.0rc6
|
||||
* `azure-storage <https://pypi.python.org/pypi/azure-storage>`_ >= 0.32.0
|
||||
* `msrestazure <https://pypi.python.org/pypi/msrestazure>`_ >= 0.4.21
|
||||
* `azure <https://pypi.org/project/azure>`_ >= 2.0.0rc6
|
||||
* `azure-common <https://pypi.org/project/azure-common>`_ >= 1.1.4
|
||||
* `azure-mgmt <https://pypi.org/project/azure-mgmt>`_ >= 0.30.0rc6
|
||||
* `azure-mgmt-compute <https://pypi.org/project/azure-mgmt-compute>`_ >= 0.33.0
|
||||
* `azure-mgmt-network <https://pypi.org/project/azure-mgmt-network>`_ >= 0.30.0rc6
|
||||
* `azure-mgmt-resource <https://pypi.org/project/azure-mgmt-resource>`_ >= 0.30.0
|
||||
* `azure-mgmt-storage <https://pypi.org/project/azure-mgmt-storage>`_ >= 0.30.0rc6
|
||||
* `azure-mgmt-web <https://pypi.org/project/azure-mgmt-web>`_ >= 0.30.0rc6
|
||||
* `azure-storage <https://pypi.org/project/azure-storage>`_ >= 0.32.0
|
||||
* `msrestazure <https://pypi.org/project/msrestazure/>`_ >= 0.4.21
|
||||
* A Microsoft Azure account
|
||||
* `Salt <https://github.com/saltstack/salt>`_
|
||||
|
||||
|
|
|
@ -230,4 +230,4 @@ Miscellaneous Information
|
|||
|
||||
.. note::
|
||||
|
||||
Additional documentation is available from `DigitalOcean <https://www.digitalocean.com/community/articles/automated-provisioning-of-digitalocean-cloud-servers-with-salt-cloud-on-ubuntu-12-04>`_.
|
||||
Additional documentation is available from `DigitalOcean <https://www.digitalocean.com/community/tutorials/automated-provisioning-of-digitalocean-cloud-servers-with-salt-cloud-on-ubuntu-12-04>`_.
|
||||
|
|
|
@ -648,7 +648,7 @@ Load Balancer
|
|||
=============
|
||||
Compute Engine possess a load-balancer feature for splitting traffic across
|
||||
multiple instances. Please reference the
|
||||
`documentation <https://developers.google.com/compute/docs/load-balancing/>`_
|
||||
`documentation <https://cloud.google.com/load-balancing/docs>`_
|
||||
for a more complete description.
|
||||
|
||||
The load-balancer functionality is slightly different than that described
|
||||
|
|
|
@ -6,7 +6,7 @@ Libvirt is a toolkit to interact with the virtualization capabilities of recent
|
|||
of Linux (and other OSes). This driver Salt cloud provider is currently geared towards
|
||||
libvirt with qemu-kvm.
|
||||
|
||||
http://www.libvirt.org/
|
||||
https://libvirt.org/
|
||||
|
||||
Host Dependencies
|
||||
=================
|
||||
|
|
|
@ -37,16 +37,16 @@ New Cloud Provider Support
|
|||
The following cloud providers are now supported:
|
||||
|
||||
Amazon AWS
|
||||
http://aws.amazon.com/ec2/
|
||||
https://aws.amazon.com/ec2/
|
||||
|
||||
Rackspace Cloud
|
||||
http://www.rackspace.com/cloud/
|
||||
https://www.rackspace.com/cloud
|
||||
|
||||
Linode
|
||||
https://www.linode.com/
|
||||
|
||||
Joyent
|
||||
http://www.joyent.com/
|
||||
https://www.joyent.com/
|
||||
|
||||
GoGrid
|
||||
http://www.gogrid.com/
|
||||
|
|
|
@ -13,7 +13,7 @@ us access to their cloud so that we could develop the Parallels driver! Without
|
|||
their help, this driver would not exist. Please take a moment to take a look at
|
||||
their cloud offering:
|
||||
|
||||
http://xmission.com/cloud_hosting
|
||||
https://xmission.com/cloud_hosting
|
||||
|
||||
We would also like to thank DigitalOcean for their help and resources while
|
||||
developing the driver for their cloud offering. The folks over there have been
|
||||
|
|
|
@ -9,7 +9,7 @@ Dependencies
|
|||
The SoftLayer driver for Salt Cloud requires the softlayer package, which is
|
||||
available at PyPI:
|
||||
|
||||
https://pypi.python.org/pypi/SoftLayer
|
||||
https://pypi.org/project/SoftLayer/
|
||||
|
||||
This package can be installed using ``pip`` or ``easy_install``:
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
Getting Started with VEXXHOST
|
||||
=============================
|
||||
|
||||
`VEXXHOST <http://vexxhost.com>`_ is a cloud computing host which provides
|
||||
`Canadian cloud computing <http://vexxhost.com/cloud-computing>`_ services
|
||||
`VEXXHOST <https://vexxhost.com/>`_ is a cloud computing host which provides
|
||||
`Canadian cloud computing <https://vexxhost.com//cloud-computing>`_ services
|
||||
which are based in Monteral and use the libcloud OpenStack driver. VEXXHOST
|
||||
currently runs the Havana release of OpenStack. When provisioning new
|
||||
instances, they automatically get a public IP and private IP address.
|
||||
|
|
|
@ -17,7 +17,7 @@ Dependencies
|
|||
The vmware module for Salt Cloud requires the ``pyVmomi`` package, which is
|
||||
available at PyPI:
|
||||
|
||||
https://pypi.python.org/pypi/pyvmomi
|
||||
https://pypi.org/project/pyvmomi/
|
||||
|
||||
This package can be installed using `pip` or `easy_install`:
|
||||
|
||||
|
@ -508,7 +508,7 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or
|
|||
Specify the guest id of the VM. For a full list of supported values see the
|
||||
VMware vSphere documentation:
|
||||
|
||||
http://pubs.vmware.com/vsphere-60/topic/com.vmware.wssdk.apiref.doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
|
||||
https://code.vmware.com/apis?pid=com.vmware.wssdk.apiref.doc&release=vsphere-60&topic=vim.vm.GuestOsDescriptor.GuestOsIdentifier.html
|
||||
|
||||
.. note::
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ Minion installer.
|
|||
|
||||
* `impacket project home`__
|
||||
|
||||
.. __: https://code.google.com/p/impacket/
|
||||
.. __: https://github.com/SecureAuthCorp/impacket
|
||||
|
||||
`winexe` is less commonly available in distribution-specific repositories.
|
||||
However, it is currently being built for various distributions in 3rd party
|
||||
|
@ -37,7 +37,7 @@ channels:
|
|||
|
||||
* `openSUSE Build Service`__
|
||||
|
||||
.. __: http://software.opensuse.org/package/winexe
|
||||
.. __: https://software.opensuse.org/package/winexe
|
||||
|
||||
* `pypsexec project home`__
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ Setup Dependencies
|
|||
This driver requires a copy of the freely available ``XenAPI.py`` Python module.
|
||||
|
||||
Information about the Xen API Python module in the XenServer SDK
|
||||
can be found at https://xenserver.org/partners/developing-products-for-xenserver.html
|
||||
can be found at https://pypi.org/project/XenAPI/
|
||||
|
||||
|
||||
Place a copy of this module on your system. For example, it can
|
||||
|
|
|
@ -203,11 +203,11 @@ Fork a Repo Guide_>`_ and is well worth reading.
|
|||
|
||||
If your change fixes a bug or implements a feature already filed in the
|
||||
`issue tracker`_, be sure to
|
||||
`reference the issue <https://help.github.com/en/articles/closing-issues-using-keywords>`_
|
||||
`reference the issue <https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue>`_
|
||||
number in the commit message body.
|
||||
|
||||
If you get stuck, there are many introductory Git resources on
|
||||
http://help.github.com.
|
||||
https://help.github.com/en.
|
||||
|
||||
#. Push your locally-committed changes to your GitHub fork.
|
||||
|
||||
|
@ -452,8 +452,8 @@ Script, see the Bootstrap Script's `Contributing Guidelines`_.
|
|||
.. _`issue tracker`: https://github.com/saltstack/salt/issues
|
||||
.. _`Fork saltstack/salt`: https://github.com/saltstack/salt/fork
|
||||
.. _'Git resources`: https://help.github.com/articles/good-resources-for-learning-git-and-github/
|
||||
.. _`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
|
||||
.. _`Closing issues via commit message`: https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue
|
||||
.. _`git format-patch`: https://mirrors.edge.kernel.org/pub/software/scm/git/docs/git-format-patch.html
|
||||
.. _salt-users: https://groups.google.com/forum/#!forum/salt-users
|
||||
.. _GPG Probot: https://probot.github.io/apps/gpg/
|
||||
.. _help articles: https://help.github.com/articles/signing-commits-with-gpg/
|
||||
|
@ -465,6 +465,6 @@ Script, see the Bootstrap Script's `Contributing Guidelines`_.
|
|||
.. _`SEP 15`: https://github.com/saltstack/salt-enhancement-proposals/pull/21
|
||||
.. _`pre-commit`: https://pre-commit.com/
|
||||
.. _`SaltStack Community Slack`: https://saltstackcommunity.herokuapp.com/
|
||||
.. _`#salt on freenode`: http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83
|
||||
.. _`#salt on freenode`: https://webchat.freenode.net/#salt
|
||||
.. _`saltstack meetup`: https://www.meetup.com/pro/saltstack/
|
||||
.. _`saltstack on serverfault`: https://serverfault.com/questions/tagged/saltstack
|
||||
|
|
|
@ -26,8 +26,8 @@ writing guidelines. Those guidelines are not strictly enforced but rather serve
|
|||
as an excellent resource for technical writing questions. The `NCBI style
|
||||
guide`_ is another very approachable resource.
|
||||
|
||||
.. _`IEEE style guide`: https://development.standards.ieee.org/myproject/Public/mytools/draft/styleman.pdf
|
||||
.. _`NCBI style guide`: http://www.ncbi.nlm.nih.gov/books/NBK993/
|
||||
.. _`IEEE style guide`: https://mentor.ieee.org/myproject/Public/mytools/draft/styleman.pdf
|
||||
.. _`NCBI style guide`: https://www.ncbi.nlm.nih.gov/books/NBK993/
|
||||
|
||||
Point-of-view
|
||||
-------------
|
||||
|
|
|
@ -244,7 +244,7 @@ repositories so if a repository does not yet have regular contributors or if
|
|||
your pull request has stayed open for more than a couple days feel free to
|
||||
"selfie-merge" your own pull request.
|
||||
|
||||
.. _`at-mention`: https://help.github.com/articles/basic-writing-and-formatting-syntax/#mentioning-users-and-teams
|
||||
.. _`at-mention`: https://help.github.com/en/github/writing-on-github/basic-writing-and-formatting-syntax#mentioning-people-and-teams
|
||||
|
||||
Style
|
||||
-----
|
||||
|
@ -1318,7 +1318,7 @@ A sample skeleton for the `CHANGELOG.rst` file:
|
|||
Versioning
|
||||
----------
|
||||
|
||||
Formula are versioned according to Semantic Versioning, http://semver.org/.
|
||||
Formula are versioned according to Semantic Versioning, https://semver.org/.
|
||||
|
||||
.. note::
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ be passed as an argument to the pylint_ program as follows:
|
|||
to submit changes. The ``.pylintrc`` file can be used for linting, but the
|
||||
``testing.pylintrc`` is the source of truth when submitting pull requests.
|
||||
|
||||
.. _pylint: http://www.pylint.org
|
||||
.. _pylint: https://www.pylint.org/
|
||||
.. _saltpylint: https://github.com/saltstack/salt-pylint
|
||||
|
||||
Variables
|
||||
|
@ -135,7 +135,7 @@ Dictionaries should be initialized using `{}` instead of `dict()`.
|
|||
|
||||
See here_ for an in-depth discussion of this topic.
|
||||
|
||||
.. _here: http://doughellmann.com/2012/11/12/the-performance-impact-of-using-dict-instead-of-in-cpython-2-7-2.html
|
||||
.. _here: https://doughellmann.com/blog/2012/11/12/the-performance-impact-of-using-dict-instead-of-in-cpython-2-7-2/
|
||||
|
||||
|
||||
Imports
|
||||
|
@ -203,7 +203,7 @@ avoided.
|
|||
any custom states or modules. However, the practice of avoiding absolute
|
||||
imports still applies to all other cases as to avoid a name conflict.
|
||||
|
||||
.. _`absolute imports`: http://legacy.python.org/dev/peps/pep-0328/#rationale-for-absolute-imports
|
||||
.. _`absolute imports`: https://legacy.python.org/dev/peps/pep-0328/#rationale-for-absolute-imports
|
||||
|
||||
|
||||
Code Churn
|
||||
|
@ -214,7 +214,7 @@ PEP 8. Code churn is a leading source of bugs and is **strongly discouraged**.
|
|||
While style fixes are encouraged they should be isolated to a single file per
|
||||
commit, and the changes should be legitimate, if there are any questions about
|
||||
whether a style change is legitimate please reference this document and the
|
||||
official PEP 8 (http://legacy.python.org/dev/peps/pep-0008/) document before
|
||||
official PEP 8 (https://legacy.python.org/dev/peps/pep-0008/) document before
|
||||
changing code. Many claims that a change is PEP 8 have been invalid, please
|
||||
double check before committing fixes.
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ Create a new `virtualenv`_:
|
|||
|
||||
virtualenv /path/to/your/virtualenv
|
||||
|
||||
.. _`virtualenv`: https://pypi.python.org/pypi/virtualenv
|
||||
.. _`virtualenv`: https://pypi.org/project/virtualenv/
|
||||
|
||||
Avoid making your :ref:`virtualenv path too long <too_long_socket_path>`.
|
||||
|
||||
|
|
|
@ -320,7 +320,7 @@ The current list of test suite images is on Salt's `docker repository`_.
|
|||
Custom `docker`_ containers can be provided by submitting a pull request
|
||||
against Salt's `docker Salt test containers`_ repository.
|
||||
|
||||
.. _`docker`: https://www.docker.io/
|
||||
.. _`docker`: https://www.docker.com/
|
||||
.. _`docker repository`: https://index.docker.io/u/salttest/
|
||||
.. _`docker Salt test containers`: https://github.com/saltstack/docker-containers
|
||||
|
||||
|
|
|
@ -603,7 +603,7 @@ Evaluating Truth
|
|||
A longer discussion on the types of assertions one can make can be found by
|
||||
reading `Python's documentation on unit testing`__.
|
||||
|
||||
.. __: http://docs.python.org/2/library/unittest.html#unittest.TestCase
|
||||
.. __: https://docs.python.org/2/library/unittest.html#unittest.TestCase
|
||||
|
||||
|
||||
Tests Using Mock Objects
|
||||
|
@ -679,7 +679,7 @@ additional imports for MagicMock:
|
|||
# assertion.
|
||||
db_exq.assert_has_calls(expected_call)
|
||||
|
||||
.. __: http://www.voidspace.org.uk/python/mock/index.html
|
||||
.. __: https://docs.python.org/3/library/unittest.mock.html
|
||||
|
||||
|
||||
Modifying ``__salt__`` In Place
|
||||
|
|
|
@ -72,7 +72,7 @@ local copy of the branch with a single command:
|
|||
.. note::
|
||||
|
||||
For an explanation on ``pull`` vs ``pull --rebase`` and other excellent
|
||||
points, see `this article <http://mislav.net/2013/02/merge-vs-rebase/>`_ by
|
||||
points, see `this article <https://mislav.net/2013/02/merge-vs-rebase/>`_ by
|
||||
Mislav Marohnić.
|
||||
|
||||
------
|
||||
|
@ -155,7 +155,7 @@ GitHub username and password.
|
|||
.. note::
|
||||
|
||||
If authentication over https does not work, you can alternatively setup
|
||||
`ssh keys <https://help.github.com/articles/generating-ssh-keys/>`_. Once
|
||||
`ssh keys <https://help.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh>`_. Once
|
||||
you have done this, you may need add the keys to your git repository
|
||||
configuration
|
||||
|
||||
|
|
|
@ -58,8 +58,8 @@ authentication and encryption are integral to Salt. Salt takes
|
|||
advantage of communication via `msgpack`_, enabling fast and light
|
||||
network traffic.
|
||||
|
||||
.. _`ZeroMQ`: http://zeromq.org/
|
||||
.. _`msgpack`: http://msgpack.org/
|
||||
.. _`ZeroMQ`: https://zeromq.org/
|
||||
.. _`msgpack`: https://msgpack.org/
|
||||
.. _`AES`: https://en.wikipedia.org/wiki/Advanced_Encryption_Standard
|
||||
|
||||
Python client interface
|
||||
|
@ -120,7 +120,7 @@ can use the `Freenode webchat client`_ right from your browser.
|
|||
`Logs of the IRC channel activity`_ are being collected courtesy of Moritz Lenz.
|
||||
|
||||
.. _Freenode: http://freenode.net/irc_servers.shtml
|
||||
.. _`Freenode webchat client`: http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83
|
||||
.. _`Freenode webchat client`: https://webchat.freenode.net/#salt
|
||||
.. _`Logs of the IRC channel activity`: http://irclog.perlgeek.de/salt/
|
||||
|
||||
If you wish to discuss the development of Salt itself join us in
|
||||
|
@ -150,7 +150,7 @@ Example Salt States
|
|||
===================
|
||||
|
||||
The official ``salt-states`` repository is:
|
||||
https://github.com/saltstack/salt-states
|
||||
https://github.com/SS-archive/salt-states
|
||||
|
||||
A few examples of salt states from the community:
|
||||
|
||||
|
@ -173,10 +173,10 @@ Other community links
|
|||
|
||||
- `Salt Stack Inc. <http://www.saltstack.com>`_
|
||||
- `Subreddit <http://www.reddit.com/r/saltstack>`_
|
||||
- `YouTube <http://www.youtube.com/user/SaltStack>`_
|
||||
- `YouTube <https://www.youtube.com/user/SaltStack>`_
|
||||
- `Facebook <https://www.facebook.com/SaltStack>`_
|
||||
- `Twitter <https://twitter.com/SaltStackInc>`_
|
||||
- `Wikipedia page <http://en.wikipedia.org/wiki/Salt_(software)>`_
|
||||
- `Wikipedia page <https://en.wikipedia.org/wiki/Salt_(software)>`_
|
||||
- `Stack Overflow <https://stackoverflow.com/questions/tagged/salt-stack>`_
|
||||
|
||||
Hack the Source
|
||||
|
|
|
@ -119,5 +119,5 @@ To start the Minion:
|
|||
Now go to the :ref:`Configuring Salt<configuring-salt>` page.
|
||||
|
||||
.. _`Bootstrap Script`: https://github.com/saltstack/salt-bootstrap
|
||||
.. _`EPEL`: http://fedoraproject.org/wiki/EPEL
|
||||
.. _`PyPI`: https://pypi.python.org/pypi/salt
|
||||
.. _`EPEL`: https://fedoraproject.org/wiki/EPEL
|
||||
.. _`PyPI`: https://pypi.org/project/salt/
|
||||
|
|
|
@ -151,17 +151,17 @@ Optional Dependencies
|
|||
settings)
|
||||
* gcc - dynamic `Cython`_ module compiling
|
||||
|
||||
.. _`Python`: http://python.org/download/
|
||||
.. _`ZeroMQ`: http://zeromq.org/
|
||||
.. _`Python`: https://www.python.org/downloads/
|
||||
.. _`ZeroMQ`: https://zeromq.org/
|
||||
.. _`pyzmq`: https://github.com/zeromq/pyzmq
|
||||
.. _`msgpack-python`: https://pypi.python.org/pypi/msgpack-python/
|
||||
.. _`msgpack-python`: https://pypi.org/project/msgpack-python/
|
||||
.. _`M2Crypto`: https://gitlab.com/m2crypto/m2crypto
|
||||
.. _`PyCrypto`: https://www.dlitz.net/software/pycrypto/
|
||||
.. _`YAML`: http://pyyaml.org/
|
||||
.. _`Jinja2`: http://jinja.pocoo.org/
|
||||
.. _`MarkupSafe`: https://pypi.python.org/pypi/MarkupSafe
|
||||
.. _`mako`: http://www.makotemplates.org/
|
||||
.. _`Cython`: http://cython.org/
|
||||
.. _`YAML`: https://pyyaml.org/
|
||||
.. _`Jinja2`: https://jinja.palletsprojects.com/en/2.11.x/
|
||||
.. _`MarkupSafe`: https://pypi.org/project/MarkupSafe/
|
||||
.. _`mako`: https://www.makotemplates.org/
|
||||
.. _`Cython`: https://cython.org/
|
||||
.. _`apache-libcloud`: http://libcloud.apache.org
|
||||
.. _`Requests`: http://docs.python-requests.org/en/latest
|
||||
.. _`Tornado`: http://www.tornadoweb.org/en/stable/
|
||||
|
|
|
@ -55,7 +55,7 @@ Beginning with version 0.9.4, Salt has been available in `EPEL`_.
|
|||
Packages in this repository are built by community, and it can take a little
|
||||
while until the latest stable SaltStack release become available.
|
||||
|
||||
.. _`EPEL`: http://fedoraproject.org/wiki/EPEL
|
||||
.. _`EPEL`: https://fedoraproject.org/wiki/EPEL
|
||||
|
||||
RHEL/CentOS 6 and 7, Scientific Linux, etc.
|
||||
-------------------------------------------
|
||||
|
@ -124,7 +124,7 @@ will need to provide your own systemd service unit.
|
|||
|
||||
Installation from pip:
|
||||
|
||||
.. _`PyPI`: https://pypi.python.org/pypi/salt
|
||||
.. _`PyPI`: https://pypi.org/project/salt/
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ Understanding Jinja
|
|||
|
||||
`Jinja`_ is the default templating language in SLS files.
|
||||
|
||||
.. _Jinja: http://jinja.pocoo.org/docs/templates/
|
||||
.. _Jinja: https://jinja.palletsprojects.com/en/2.11.x/templates/
|
||||
|
||||
Jinja in States
|
||||
===============
|
||||
|
@ -67,7 +67,7 @@ The filter_by function can also be used to set variables based on grains:
|
|||
'Debian': { 'package': 'auditd' },
|
||||
}) %}
|
||||
|
||||
.. _`for loop`: http://jinja.pocoo.org/docs/templates/#for
|
||||
.. _`for loop`: https://jinja.palletsprojects.com/en/2.11.x/templates/#for
|
||||
|
||||
Include and Import
|
||||
==================
|
||||
|
@ -106,7 +106,7 @@ current context can be passed to an included/imported template.
|
|||
{% import 'openssl/vars.sls' as ssl with context %}
|
||||
|
||||
|
||||
.. _imports: http://jinja.pocoo.org/docs/templates/#import
|
||||
.. _imports: https://jinja.palletsprojects.com/en/2.11.x/templates/#import
|
||||
|
||||
Macros
|
||||
======
|
||||
|
@ -151,10 +151,10 @@ Template Inheritance
|
|||
`Template inheritance`_ works fine from state files and files. The search path
|
||||
starts at the root of the state tree or pillar.
|
||||
|
||||
.. _`Template inheritance`: http://jinja.pocoo.org/docs/templates/#template-inheritance
|
||||
.. _`Macros`: http://jinja.pocoo.org/docs/templates/#macros
|
||||
.. _`macro`: http://jinja.pocoo.org/docs/templates/#macros
|
||||
.. _`whitespace control`: http://jinja.pocoo.org/docs/templates/#whitespace-control
|
||||
.. _`Template inheritance`: https://jinja.palletsprojects.com/en/2.11.x/templates/#template-inheritance
|
||||
.. _`Macros`: https://jinja.palletsprojects.com/en/2.11.x/templates/#macros
|
||||
.. _`macro`: https://jinja.palletsprojects.com/en/2.11.x/templates/#macros
|
||||
.. _`Whitespace control`: https://jinja.palletsprojects.com/en/2.11.x/templates/#whitespace-control
|
||||
|
||||
Errors
|
||||
======
|
||||
|
@ -1035,7 +1035,7 @@ Jinja release older than version 2.9 installed. If Jinja 2.9 or newer is
|
|||
installed, then the upstream version of the filter will be used. See the
|
||||
`upstream docs`__ for more information.
|
||||
|
||||
.. __: http://jinja.pocoo.org/docs/2.10/templates/#tojson
|
||||
.. __: https://jinja.palletsprojects.com/en/2.11.x/templates/#tojson
|
||||
|
||||
.. jinja_ref:: random_hash
|
||||
|
||||
|
@ -1435,9 +1435,9 @@ Returns:
|
|||
|
||||
Example 3: [80, 25, 22]
|
||||
|
||||
.. _`builtin filters`: http://jinja.pocoo.org/docs/templates/#builtin-filters
|
||||
.. _`builtin filters`: https://jinja.palletsprojects.com/en/2.11.x/templates/#builtin-filters
|
||||
.. _`timelib`: https://github.com/pediapress/timelib/
|
||||
.. _`JMESPath language`: http://jmespath.org/
|
||||
.. _`JMESPath language`: https://jmespath.org/
|
||||
.. _`jmespath`: https://github.com/jmespath/jmespath.py
|
||||
|
||||
.. jinja_ref:: to_snake_case
|
||||
|
@ -1918,7 +1918,7 @@ Tests
|
|||
|
||||
Saltstack extends `builtin tests`_ with these custom tests:
|
||||
|
||||
.. _`builtin tests`: http://jinja.pocoo.org/docs/templates/#builtin-tests
|
||||
.. _`builtin tests`: https://jinja.palletsprojects.com/en/2.11.x/templates/#builtin-tests
|
||||
|
||||
.. jinja_ref:: equalto
|
||||
|
||||
|
@ -2115,7 +2115,7 @@ escaped:
|
|||
<snipped>
|
||||
{% endraw %}
|
||||
|
||||
.. _`Escaping`: http://jinja.pocoo.org/docs/dev/templates/#escaping
|
||||
.. _`Escaping`: https://jinja.palletsprojects.com/en/2.11.x/templates/#escaping
|
||||
|
||||
.. jinja_ref:: calling-salt-functions
|
||||
|
||||
|
|
|
@ -97,8 +97,8 @@ Getting started
|
|||
|
||||
Install NAPALM - follow the notes_ and check the platform-specific dependencies_.
|
||||
|
||||
.. _notes: http://napalm.readthedocs.io/en/latest/installation/index.html
|
||||
.. _dependencies: http://napalm.readthedocs.io/en/latest/installation/index.html#dependencies
|
||||
.. _notes: https://napalm.readthedocs.io/en/latest/installation/index.html
|
||||
.. _dependencies: https://napalm.readthedocs.io/en/latest/installation/index.html#dependencies
|
||||
|
||||
Salt's Pillar system is ideally suited for configuring proxy-minions
|
||||
(though they can be configured in /etc/salt/proxy as well). Proxies
|
||||
|
|
|
@ -11,7 +11,7 @@ Hubble is a modular, open-source security compliance framework built on top of
|
|||
SaltStack. The project provides on-demand profile-based auditing, real-time
|
||||
security event notifications, automated remediation, alerting and reporting.
|
||||
|
||||
http://hubblestack.io/
|
||||
https://hubblestack.io/
|
||||
|
||||
alkali
|
||||
======
|
||||
|
|
|
@ -27,4 +27,4 @@ Version 0.16.3 is another bugfix release for :ref:`0.16.0
|
|||
having set :conf_master:`file_recv` in the master config file
|
||||
- Fix scheduler configuration in pillar (:issue:`6201`)
|
||||
|
||||
.. _Linaro: http://www.linaro.org/
|
||||
.. _Linaro: https://www.linaro.org/
|
|
@ -50,7 +50,7 @@ state system is ready for early testers to start playing with. If you are
|
|||
interested in working with the state system please check out the (still very
|
||||
small) salt-states GitHub repo:
|
||||
|
||||
https://github.com/saltstack/salt-states
|
||||
https://github.com/SS-archive/salt-states
|
||||
|
||||
This git repo is the active development branch for determining how a clean
|
||||
salt-state database should look and act. Since the salt state system is still
|
||||
|
|
|
@ -59,8 +59,8 @@ committers. The following individuals have contributed to the development of
|
|||
|
||||
This makes 21 new developers since 0.9.4 was released!
|
||||
|
||||
To keep up with the growing community follow Salt on Ohloh
|
||||
(http://www.ohloh.net/p/salt), to join the Salt development community, fork
|
||||
To keep up with the growing community follow Salt on Black Duck Open Hub
|
||||
(https://www.openhub.net/p/salt), to join the Salt development community, fork
|
||||
Salt on GitHub, and get coding (https://github.com/saltstack/salt)!
|
||||
|
||||
Major Features
|
||||
|
@ -75,7 +75,7 @@ For a few months now we have been talking about moving away from Python
|
|||
pickles for network serialization, but a preferred serialization format
|
||||
had not yet been found. After an extensive performance testing period
|
||||
involving everything from JSON to protocol buffers, a clear winner emerged.
|
||||
Message Pack (http://msgpack.org/) proved to not only be the fastest and most
|
||||
Message Pack (https://msgpack.org/) proved to not only be the fastest and most
|
||||
compact, but also the most "salt like". Message Pack is simple, and the code
|
||||
involved is very small. The msgpack library for Python has been added directly
|
||||
to Salt.
|
||||
|
@ -254,7 +254,7 @@ FreeBSD
|
|||
|
||||
Salt on FreeBSD? There a port for that:
|
||||
|
||||
http://svnweb.freebsd.org/ports/head/sysutils/py-salt/
|
||||
https://svnweb.freebsd.org/ports/head/sysutils/py-salt/
|
||||
|
||||
This port was developed and added by Christer Edwards. This also marks the
|
||||
first time Salt has been included in an upstream packaging system!
|
||||
|
|
|
@ -82,7 +82,7 @@ And on any Syndics:
|
|||
# apt-get install salt-syndic
|
||||
|
||||
The official Salt PPA for Ubuntu is located at:
|
||||
https://launchpad.net/~saltstack/+archive/salt
|
||||
https://launchpad.net/~saltstack/+archive/ubuntu/salt
|
||||
|
||||
|
||||
Major Features
|
||||
|
|
|
@ -63,7 +63,7 @@ For more information on Salt Stack and GCE, please see `this blog post`_.
|
|||
|
||||
Documentation for Salt and GCE can be found :ref:`here <cloud-getting-started-gce>`.
|
||||
|
||||
.. _this blog post: http://googlecloudplatform.blogspot.com/2013/12/saltstack-for-google-compute-engine.html
|
||||
.. _this blog post: https://cloudplatform.googleblog.com/2013/12/saltstack-for-google-compute-engine.html
|
||||
|
||||
|
||||
Salt Virt
|
||||
|
@ -230,7 +230,7 @@ PagerDuty Support
|
|||
Initial support for firing events via PagerDuty_ has been added. See the
|
||||
documentation for the :mod:`pagerduty <salt.modules.pagerduty>` module.
|
||||
|
||||
.. _PagerDuty: http://www.pagerduty.com
|
||||
.. _PagerDuty: https://www.pagerduty.com/
|
||||
|
||||
|
||||
Virtual Terminal
|
||||
|
|
|
@ -69,7 +69,7 @@ Install salt-ssh Using pip
|
|||
|
||||
Salt-ssh is now pip-installable!
|
||||
|
||||
https://pypi.python.org/pypi/salt-ssh/
|
||||
https://pypi.org/project/salt-ssh/
|
||||
|
||||
Pip will bring in all of the required deps, and while some deps are compiled,
|
||||
they all include pure python implementations, meaning that any compile errors
|
||||
|
|
|
@ -300,7 +300,7 @@ from network devices running widely used operating systems such: JunOS, IOS-XR,
|
|||
eOS, IOS, NX-OS etc.
|
||||
|
||||
- see `the complete list of supported devices
|
||||
<http://napalm.readthedocs.io/en/latest/support/index.html#supported-devices>`_.
|
||||
<https://napalm.readthedocs.io/en/latest/support/index.html#supported-devices>`_.
|
||||
|
||||
The connection is established via the :mod:`NAPALM proxy <salt.proxy.napalm>`.
|
||||
|
||||
|
|
|
@ -645,7 +645,7 @@ Changelog for v2016.11.7..v2016.11.8
|
|||
|
||||
* b3e2ae3c58 Merge pull request `#42805`_ from rallytime/bp-42552
|
||||
|
||||
* 5a91c1f2d1 update consul module following this documentation https://www.consul.io/api/acl.html
|
||||
* 5a91c1f2d1 update consul module following this documentation https://www.consul.io/api/acl/acl.html
|
||||
|
||||
* **ISSUE** `#42731`_: (`infoveinx`_) http.query template_data render exception (refs: `#42804`_)
|
||||
|
||||
|
|
|
@ -563,7 +563,7 @@ of objects (users, databases, roles, etc.).
|
|||
<salt.states.docker_image.present>`, :py:func:`moby.inspect_container
|
||||
<salt.modules.dockermod.inspect_container>`, etc.)
|
||||
|
||||
.. _`Moby announcement`: https://blog.docker.com/2017/04/introducing-the-moby-project/
|
||||
.. _`Moby announcement`: https://www.docker.com/blog/introducing-the-moby-project/
|
||||
.. _DockerCon: http://2017.dockercon.com/
|
||||
|
||||
The old syntax will continue to work until the **2019.2.0** release of Salt.
|
||||
|
|
|
@ -1278,7 +1278,7 @@ Changelog for v2017.7.1..v2017.7.2
|
|||
|
||||
* b3e2ae3c58 Merge pull request `#42805`_ from rallytime/bp-42552
|
||||
|
||||
* 5a91c1f2d1 update consul module following this documentation https://www.consul.io/api/acl.html
|
||||
* 5a91c1f2d1 update consul module following this documentation https://www.consul.io/api/acl/acl.html
|
||||
|
||||
* d2ee7934ed Merge pull request `#42804`_ from rallytime/bp-42784
|
||||
|
||||
|
|
|
@ -805,7 +805,7 @@ Saltclass lets you define your nodes from simple ``yaml`` files (``.yml``) throu
|
|||
pillar module completely - will be logged
|
||||
|
||||
An example subset of data is available here:
|
||||
http://git.mauras.ch/salt/saltclass/src/master/examples
|
||||
https://git.mauras.ch/salt/saltclass/src/branch/master/examples
|
||||
|
||||
========================== ===========
|
||||
Terms usable in yaml files Description
|
||||
|
|
|
@ -81,7 +81,7 @@ This test case has also been tested with the ``yaml`` and ``json`` filters succe
|
|||
cases where :jinja_ref:`json_encode_dict` and :jinja_ref:`json_encode_list`
|
||||
would have been used.
|
||||
|
||||
.. _`tojson Jinja filter`: http://jinja.pocoo.org/docs/2.10/templates/#tojson
|
||||
.. _`tojson Jinja filter`: https://jinja.palletsprojects.com/en/2.11.x/templates/#tojson
|
||||
|
||||
Ansible Playbook State and Execution Modules
|
||||
============================================
|
||||
|
|
|
@ -447,7 +447,7 @@ filter ``pillar`` data, ``yaml`` maps, and also useful with :jinja_ref:`http_que
|
|||
|
||||
Depends on the `jmespath`_ Python module.
|
||||
|
||||
.. _`JMESPath language`: http://jmespath.org/
|
||||
.. _`JMESPath language`: https://jmespath.org/
|
||||
.. _`jmespath`: https://github.com/jmespath/jmespath.py
|
||||
|
||||
Slot Syntax Updates
|
||||
|
|
|
@ -63,7 +63,7 @@ Several functions have been added to the execution module to manage worktrees_
|
|||
(a feature new to Git 2.5.0). State support does not exist yet, but will follow
|
||||
soon.
|
||||
|
||||
.. _worktrees: http://git-scm.com/docs/git-worktree
|
||||
.. _worktrees: https://git-scm.com/docs/git-worktree
|
||||
|
||||
New Functions in Git Execution Module
|
||||
-------------------------------------
|
||||
|
|
|
@ -93,7 +93,7 @@ the ``-M`` and ``-N`` flags:
|
|||
Installing Using PyPI
|
||||
=====================
|
||||
|
||||
Installing from the source archive on `PyPI <https://pypi.python.org/pypi>`_
|
||||
Installing from the source archive on `PyPI <https://pypi.org/>`_
|
||||
is fairly straightforward.
|
||||
|
||||
.. note::
|
||||
|
|
|
@ -45,7 +45,7 @@ Ubuntu PPA packaging
|
|||
Thanks to Sean Channel (`@seanchannel`_, pentabular) :program:`salt-api` is
|
||||
available as a PPA on the SaltStack LaunchPad team.
|
||||
|
||||
https://launchpad.net/~saltstack/+archive/salt
|
||||
https://launchpad.net/~saltstack/+archive/ubuntu/salt
|
||||
|
||||
.. _`@seanchannel`: https://github.com/seanchannel
|
||||
|
||||
|
|
|
@ -26,4 +26,4 @@ It is also possible to use in both pillar and state-matching
|
|||
- match: ipcidr
|
||||
- internal
|
||||
|
||||
.. _CIDR: http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing
|
||||
.. _CIDR: https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing
|
||||
|
|
|
@ -47,7 +47,7 @@ Anyone wanting to run Salt daemons via a process supervisor such as `monit`_,
|
|||
`runit`_, or `supervisord`_, should omit the ``-d`` argument to the daemons and
|
||||
run them in the foreground.
|
||||
|
||||
.. _`monit`: http://mmonit.com/monit/
|
||||
.. _`monit`: https://mmonit.com/monit/
|
||||
.. _`runit`: http://smarden.org/runit/
|
||||
.. _`supervisord`: http://supervisord.org/
|
||||
|
||||
|
@ -75,7 +75,7 @@ additional access control system such as `SELinux`_ or `AppArmor`_ is blocking
|
|||
Salt.
|
||||
|
||||
.. _`SELinux`: https://en.wikipedia.org/wiki/Security-Enhanced_Linux
|
||||
.. _`AppArmor`: http://wiki.apparmor.net/index.php/Main_Page
|
||||
.. _`AppArmor`: https://gitlab.com/apparmor/apparmor/-/wikis/home
|
||||
|
||||
|
||||
.. _using-salt-call:
|
||||
|
@ -212,7 +212,7 @@ come with Python 2.4 installed by default. When installing on RHEL 5 from the
|
|||
advised that its dependencies need to be installed from EPEL and that Salt
|
||||
needs to be run with the ``python26`` executable.
|
||||
|
||||
.. _`EPEL repository`: http://fedoraproject.org/wiki/EPEL
|
||||
.. _`EPEL repository`: https://fedoraproject.org/wiki/EPEL
|
||||
|
||||
Common YAML Gotchas
|
||||
===================
|
||||
|
|
|
@ -19,7 +19,7 @@ Anyone wanting to run Salt daemons via a process supervisor such as `monit`_,
|
|||
`runit`_, or `supervisord`_, should omit the ``-d`` argument to the daemons and
|
||||
run them in the foreground.
|
||||
|
||||
.. _`monit`: http://mmonit.com/monit/
|
||||
.. _`monit`: https://mmonit.com/monit/
|
||||
.. _`runit`: http://smarden.org/runit/
|
||||
.. _`supervisord`: http://supervisord.org/
|
||||
|
||||
|
@ -38,7 +38,7 @@ check that no additional access control system such as `SELinux`_ or
|
|||
`AppArmor`_ is blocking Salt.
|
||||
|
||||
.. _`SELinux`: https://en.wikipedia.org/wiki/Security-Enhanced_Linux
|
||||
.. _`AppArmor`: http://wiki.apparmor.net/index.php/Main_Page
|
||||
.. _`AppArmor`: https://gitlab.com/apparmor/apparmor/-/wikis/home
|
||||
|
||||
Too many open files
|
||||
===================
|
||||
|
|
|
@ -17,7 +17,7 @@ Anyone wanting to run Salt daemons via a process supervisor such as `monit`_,
|
|||
`runit`_, or `supervisord`_, should omit the ``-d`` argument to the daemons and
|
||||
run them in the foreground.
|
||||
|
||||
.. _`monit`: http://mmonit.com/monit/
|
||||
.. _`monit`: https://mmonit.com/monit/
|
||||
.. _`runit`: http://smarden.org/runit/
|
||||
.. _`supervisord`: http://supervisord.org/
|
||||
|
||||
|
@ -64,10 +64,10 @@ check that no additional access control system such as `SELinux`_ or
|
|||
to determine if an intermediate device or firewall is blocking the needed
|
||||
TCP ports.
|
||||
|
||||
.. _`Nmap`: http://nmap.org/
|
||||
.. _`Nmap`: https://nmap.org/
|
||||
.. _`SELinux`: https://en.wikipedia.org/wiki/Security-Enhanced_Linux
|
||||
.. _`AppArmor`: http://wiki.apparmor.net/index.php/Main_Page
|
||||
.. _`tcptraceroute`: http://linux.die.net/man/1/tcptraceroute
|
||||
.. _`AppArmor`: https://gitlab.com/apparmor/apparmor/-/wikis/home
|
||||
.. _`tcptraceroute`: https://linux.die.net/man/1/tcptraceroute
|
||||
|
||||
.. _troubleshooting-minion-salt-call:
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ file that cause YAML issues. It is wise to be aware of these issues. While
|
|||
reports or running into them are generally rare they can still crop up at
|
||||
unexpected times.
|
||||
|
||||
.. _`YAML`: http://yaml.org/spec/1.1/
|
||||
.. _`YAML`: https://yaml.org/spec/1.1/
|
||||
|
||||
Spaces vs Tabs
|
||||
==============
|
||||
|
@ -24,7 +24,7 @@ normal mode(you can hit `ESC` twice to be sure): ``/``, `Ctrl-v`, `Tab`, then
|
|||
hit `Enter`. Also, you can convert tabs to 2 spaces by these commands in Vim:
|
||||
``:set tabstop=2 expandtab`` and then ``:retab``.
|
||||
|
||||
.. _`YAML uses spaces`: http://yaml.org/spec/1.1/#id871998
|
||||
.. _`YAML uses spaces`: https://yaml.org/spec/1.1/#id871998
|
||||
|
||||
Indentation
|
||||
===========
|
||||
|
@ -181,7 +181,7 @@ them.
|
|||
day: 1 - Every Sunday
|
||||
{% endload %}
|
||||
|
||||
.. __: http://stackoverflow.com/a/31007425
|
||||
.. __: https://stackoverflow.com/questions/23812676/pyyaml-parses-900-as-int/31007425#31007425
|
||||
|
||||
YAML does not like "Double Short Decs"
|
||||
======================================
|
||||
|
@ -289,7 +289,7 @@ Examples:
|
|||
|
||||
List of usable `Unicode characters`_ will help you to identify correct numbers.
|
||||
|
||||
.. _`Unicode characters`: http://en.wikipedia.org/wiki/List_of_Unicode_characters
|
||||
.. _`Unicode characters`: https://en.wikipedia.org/wiki/List_of_Unicode_characters
|
||||
|
||||
|
||||
Python can also be used to discover the Unicode number for a character:
|
||||
|
@ -316,7 +316,7 @@ If a definition only includes numbers and underscores, it is parsed by YAML as
|
|||
an integer and all underscores are stripped. To ensure the object becomes a
|
||||
string, it should be surrounded by quotes. `More information here`_.
|
||||
|
||||
.. _`More information here`: http://stackoverflow.com/questions/2723321/snakeyaml-how-to-disable-underscore-stripping-when-parsing
|
||||
.. _`More information here`: https://stackoverflow.com/questions/2723321/snakeyaml-how-to-disable-underscore-stripping-when-parsing
|
||||
|
||||
Here's an example:
|
||||
|
||||
|
@ -384,4 +384,4 @@ longer that 1024 characters. PyYAML enforces these limitations (see here__),
|
|||
and therefore anything parsed as YAML in Salt is subject to them.
|
||||
|
||||
.. _`YAML Spec`: https://yaml.org/spec/1.2/spec.html#id2792424
|
||||
.. __: https://github.com/yaml/pyyaml/blob/eb459f8/lib/yaml/scanner.py#L279-L293
|
||||
.. __: https://github.com/yaml/pyyaml/blob/eb459f8/lib/yaml/scanner.py#L279-L293
|
|
@ -186,7 +186,7 @@ CentOS
|
|||
|
||||
These images have been prepared for OpenNebula but should work without issue with
|
||||
Salt Virt, only the raw qcow image file is needed:
|
||||
http://wiki.centos.org/Cloud/OpenNebula
|
||||
https://wiki.centos.org/Cloud/OpenNebula
|
||||
|
||||
Fedora Linux
|
||||
~~~~~~~~~~~~
|
||||
|
|
|
@ -21,7 +21,7 @@ ESXi Proxy Minion
|
|||
basic understanding of ESXi hosts. You can learn more about ESXi hosts on
|
||||
`VMware's various resources`_.
|
||||
|
||||
.. _VMware's various resources: https://www.vmware.com/products/esxi-and-esx/overview
|
||||
.. _VMware's various resources: https://www.vmware.com/products/esxi-and-esx.html
|
||||
|
||||
Salt's ESXi Proxy Minion allows a VMware ESXi host to be treated as an individual
|
||||
Salt Minion, without installing a Salt Minion on the ESXi host.
|
||||
|
@ -50,7 +50,7 @@ Salt's ESXi Proxy Minion was added in the 2015.8.4 release of Salt.
|
|||
|
||||
Please see the `vSphere Comparison`_ page for more information.
|
||||
|
||||
.. _vSphere Comparison: https://www.vmware.com/products/vsphere/compare
|
||||
.. _vSphere Comparison: https://www.vmware.com/products/vsphere.html#compare
|
||||
|
||||
|
||||
Dependencies
|
||||
|
|
|
@ -38,7 +38,7 @@ Don't forget to reload after you made your changes.
|
|||
|
||||
firewall-cmd --reload
|
||||
|
||||
.. _`FirewallD`: https://fedoraproject.org/wiki/FirewallD
|
||||
.. _`FirewallD`: https://fedoraproject.org/wiki/Firewalld
|
||||
|
||||
RHEL 6 / CentOS 6
|
||||
=================
|
||||
|
@ -148,7 +148,7 @@ Different Linux distributions store their `iptables` (also known as
|
|||
standardize firewall documentation. Included are some of the more
|
||||
common locations, but your mileage may vary.
|
||||
|
||||
.. _`netfilter`: http://www.netfilter.org/
|
||||
.. _`netfilter`: https://netfilter.org/
|
||||
|
||||
**Fedora / RHEL / CentOS**:
|
||||
|
||||
|
|
|
@ -93,9 +93,9 @@ releases pygit2_ 0.20.3 and libgit2_ 0.20.0 is the recommended combination.
|
|||
.. _changelog: https://github.com/libgit2/pygit2#changelog
|
||||
.. _saltstack-issue-tracker: https://github.com/saltstack/salt/issues
|
||||
.. _pygit2-install-instructions: http://www.pygit2.org/install.html
|
||||
.. _libgit2: https://libgit2.github.com/
|
||||
.. _libssh2: http://www.libssh2.org/
|
||||
.. _python-cffi: https://pypi.python.org/pypi/cffi
|
||||
.. _libgit2: https://libgit2.org/
|
||||
.. _libssh2: https://www.libssh2.org/
|
||||
.. _python-cffi: https://pypi.org/project/cffi
|
||||
.. _libffi: http://sourceware.org/libffi/
|
||||
|
||||
|
||||
|
@ -486,7 +486,7 @@ be useful to fetch custom refs (such as those created for `GitHub pull
|
|||
requests`__). To change the refspecs GitFS fetches, use the
|
||||
:conf_master:`gitfs_refspecs` config option:
|
||||
|
||||
.. __: https://help.github.com/articles/checking-out-pull-requests-locally/
|
||||
.. __: https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
|
@ -1155,7 +1155,7 @@ anything, so long as the usage is consistent.
|
|||
The ``root`` user name in the hook script and sudo policy should be changed to
|
||||
match the user under which the minion is running.
|
||||
|
||||
.. _`post-receive hook`: http://www.git-scm.com/book/en/Customizing-Git-Git-Hooks#Server-Side-Hooks
|
||||
.. _`post-receive hook`: https://www.git-scm.com/book/en/v2/Customizing-Git-Git-Hooks#Server-Side-Hooks
|
||||
|
||||
.. _git-as-ext_pillar:
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ Drivers can be configured in the Salt Configuration/Minion settings. All libclou
|
|||
be configured with authentication details for each driver.
|
||||
|
||||
Each driver will have a string identifier, these can be found in the libcloud.<api>.types.Provider class
|
||||
for each API, http://libcloud.readthedocs.io/en/latest/supported_providers.html
|
||||
for each API, https://libcloud.readthedocs.io/en/latest/supported_providers.html
|
||||
|
||||
Some drivers require additional parameters, which are documented in the Apache Libcloud documentation. For example,
|
||||
GoDaddy DNS expects "`shopper_id`", which is the customer ID. These additional parameters can be added to the profile settings
|
||||
|
@ -83,7 +83,7 @@ Using the execution modules
|
|||
Amongst over 60 clouds that Apache Libcloud supports, you can add profiles to your Salt configuration to access and control these clouds.
|
||||
Each of the libcloud execution modules exposes the common API methods for controlling Compute, DNS, Load Balancers and Object Storage.
|
||||
To see which functions are supported across specific clouds, see the Libcloud `supported methods
|
||||
<http://libcloud.readthedocs.io/en/latest/supported_providers.html#supported-methods-block-storage>`_ documentation.
|
||||
<https://libcloud.readthedocs.io/en/latest/supported_providers.html#supported-methods-block-storage>`_ documentation.
|
||||
|
||||
The module documentation explains each of the API methods and how to leverage them.
|
||||
|
||||
|
@ -223,7 +223,7 @@ Accessing custom arguments in execution modules
|
|||
Some cloud providers have additional functionality that can be accessed on top of the base API, for example
|
||||
the Google Cloud Engine load balancer service offers the ability to provision load balancers into a specific region.
|
||||
|
||||
Looking at the `API documentation <http://libcloud.readthedocs.io/en/latest/loadbalancer/drivers/gce.html#libcloud.loadbalancer.drivers.gce.GCELBDriver.create_balancer>`_,
|
||||
Looking at the `API documentation <https://libcloud.readthedocs.io/en/latest/loadbalancer/drivers/gce.html#libcloud.loadbalancer.drivers.gce.GCELBDriver.create_balancer>`_,
|
||||
we can see that it expects an `ex_region` in the `create_balancer` method, so when we execute the salt command, we can add this additional parameter like this:
|
||||
|
||||
.. code-block:: bash
|
||||
|
|
|
@ -47,7 +47,7 @@ master config file.
|
|||
There is no single method to get the keypair to your minion. The difficulty is
|
||||
finding a distribution method which is secure. For Amazon EC2 only, an AWS best
|
||||
practice is to use IAM Roles to pass credentials. (See blog post,
|
||||
http://blogs.aws.amazon.com/security/post/Tx610S2MLVZWEA/Using-IAM-roles-to-distribute-non-AWS-credentials-to-your-EC2-instances )
|
||||
https://aws.amazon.com/blogs/security/using-iam-roles-to-distribute-non-aws-credentials-to-your-ec2-instances/ )
|
||||
|
||||
.. admonition:: Security Warning
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
Salt Masterless Quickstart
|
||||
==========================
|
||||
|
||||
.. _`Vagrant`: http://www.vagrantup.com/
|
||||
.. _`Vagrant salt provisioner`: http://docs.vagrantup.com/v2/provisioning/salt.html
|
||||
.. _`Vagrant`: https://www.vagrantup.com/
|
||||
.. _`Vagrant salt provisioner`: https://www.vagrantup.com/docs/provisioning/salt.html
|
||||
.. _`salt-bootstrap`: https://github.com/saltstack/salt-bootstrap
|
||||
|
||||
Running a masterless salt-minion lets you use Salt's configuration management
|
||||
|
|
|
@ -90,7 +90,7 @@ Finally, on line five, is the word ``require``. This is called a Requisite
|
|||
Statement, and it makes sure that the Apache service is only started after
|
||||
a successful installation of the apache package.
|
||||
|
||||
.. _`YAML`: http://yaml.org/spec/1.1/
|
||||
.. _`YAML`: https://yaml.org/spec/1.1/
|
||||
|
||||
|
||||
Adding Configs and Users
|
||||
|
@ -336,10 +336,10 @@ provides a flexible, domain-specific language for authoring SLS data in Python;
|
|||
and the :mod:`pyobjects<salt.renderers.pyobjects>` renderer
|
||||
gives you a `"Pythonic"`_ interface to building state data.
|
||||
|
||||
.. _`Jinja2`: http://jinja.pocoo.org/
|
||||
.. _`Mako`: http://www.makotemplates.org/
|
||||
.. _`Jinja2`: https://jinja.palletsprojects.com/en/2.11.x/
|
||||
.. _`Mako`: https://www.makotemplates.org/
|
||||
.. _`Wempy`: https://fossil.secution.com/u/gcw/wempy/doc/tip/README.wiki
|
||||
.. _`"Pythonic"`: http://legacy.python.org/dev/peps/pep-0008/
|
||||
.. _`"Pythonic"`: https://legacy.python.org/dev/peps/pep-0008/
|
||||
|
||||
.. note::
|
||||
|
||||
|
@ -356,7 +356,7 @@ Getting to Know the Default - jinja|yaml
|
|||
|
||||
The default renderer - ``jinja|yaml``, allows for use of the jinja
|
||||
templating system. A guide to the Jinja templating system can be found here:
|
||||
http://jinja.pocoo.org/docs
|
||||
https://jinja.palletsprojects.com/en/2.11.x/
|
||||
|
||||
When working with renderers a few very useful bits of data are passed in. In
|
||||
the case of templating engine based renderers, three critical components are
|
||||
|
|
|
@ -116,7 +116,7 @@ in the :mod:`pkg state <salt.states.pkg>` module to call.
|
|||
default format. The default can be changed by editing
|
||||
:conf_master:`renderer` in the master configuration file.
|
||||
|
||||
.. _`DSLs`: http://en.wikipedia.org/wiki/Domain-specific_language
|
||||
.. _`DSLs`: https://en.wikipedia.org/wiki/Domain-specific_language
|
||||
|
||||
.. _running-highstate:
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ accomplished with module templating. The default module templating system used
|
|||
is `Jinja2`_ and may be configured by changing the :conf_master:`renderer`
|
||||
value in the master config.
|
||||
|
||||
.. _`Jinja2`: http://jinja.pocoo.org/
|
||||
.. _`Jinja2`: https://jinja.palletsprojects.com/en/2.11.x/
|
||||
|
||||
All states are passed through a templating system when they are initially read.
|
||||
To make use of the templating system, simply add some templating markup.
|
||||
|
|
|
@ -115,7 +115,7 @@ it all over again. It also lets you *uninstall* things easily.
|
|||
Install Homebrew
|
||||
----------------
|
||||
|
||||
Install Homebrew here http://brew.sh/
|
||||
Install Homebrew here https://brew.sh/
|
||||
|
||||
Or just type
|
||||
|
||||
|
@ -217,13 +217,13 @@ customizing it using "provisioners". In our case, we'll use it to:
|
|||
Install VirtualBox
|
||||
------------------
|
||||
|
||||
Go get it here: https://www.virtualBox.org/wiki/Downloads (click on VirtualBox
|
||||
Go get it here: https://www.virtualbox.org/wiki/Downloads (click on VirtualBox
|
||||
for macOS hosts => x86/amd64)
|
||||
|
||||
Install Vagrant
|
||||
---------------
|
||||
|
||||
Go get it here: http://downloads.vagrantup.com/ and choose the latest version
|
||||
Go get it here: https://www.vagrantup.com/downloads.html and choose the latest version
|
||||
(1.3.5 at time of writing), then the .dmg file. Double-click to install it.
|
||||
Make sure the ``vagrant`` command is found when run in the terminal. Type
|
||||
``vagrant``. It should display a list of commands.
|
||||
|
|
|
@ -502,6 +502,6 @@ Python testing documentation. Please see the follow references for more informat
|
|||
* `Python Unittest`_
|
||||
* `Python's Assert Functions`_
|
||||
|
||||
.. _MagicMock: http://www.voidspace.org.uk/python/mock/index.html
|
||||
.. _MagicMock: https://docs.python.org/3/library/unittest.mock.html
|
||||
.. _Python Unittest: https://docs.python.org/2/library/unittest.html
|
||||
.. _Python's Assert Functions: https://docs.python.org/2/library/unittest.html#assert-methods
|
||||
|
|
|
@ -853,7 +853,7 @@ called ``name`` can be used to resolve these conflicts:
|
|||
- https://github.com/foobar/baz:
|
||||
- name: baz_the_third
|
||||
|
||||
.. _wiki: http://wpkg.org/Category:Silent_Installers
|
||||
.. _wiki: https://wpkg.org/Category:Silent_Installers
|
||||
|
||||
Troubleshooting
|
||||
===============
|
||||
|
|
Loading…
Add table
Reference in a new issue