mirror of
https://github.com/saltstack/salt.git
synced 2025-04-10 23:01:39 +00:00
A few additional replacements for `SaltStack, Inc`
This commit is contained in:
Pedro Algarvio
Megan Wilhite
parent
3d72ba1800
commit
2f6844f621
11 changed files with 32 additions and 32 deletions
|
|
@ -1,6 +1,6 @@
|
|||
codecov:
|
||||
ci:
|
||||
- jenkinsci.saltstack.com
|
||||
- jenkins.saltproject.io
|
||||
- github.com
|
||||
|
||||
max_report_age: 24 # The age you want coverage reports to expire at, or if you
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ html_show_copyright = True
|
|||
### Latex options
|
||||
|
||||
latex_documents = [
|
||||
("contents", "Salt.tex", "Salt Documentation", "SaltStack, Inc.", "manual"),
|
||||
("contents", "Salt.tex", "Salt Documentation", "VMware, Inc.", "manual"),
|
||||
]
|
||||
|
||||
latex_logo = "_static/salt-logo.png"
|
||||
|
|
@ -328,7 +328,7 @@ linkcheck_ignore = [
|
|||
r"dash-feed://",
|
||||
r"https://github.com/saltstack/salt/",
|
||||
r"http://bootstrap.saltstack.org",
|
||||
r"https://bootstrap.saltstack.com",
|
||||
r"https://bootstrap.saltproject.io",
|
||||
r"https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh",
|
||||
r"media.readthedocs.org/dash/salt/latest/salt.xml",
|
||||
r"https://portal.aws.amazon.com/gp/aws/securityCredentials",
|
||||
|
|
@ -365,12 +365,12 @@ man_pages = [
|
|||
|
||||
### epub options
|
||||
epub_title = "Salt Documentation"
|
||||
epub_author = "SaltStack, Inc."
|
||||
epub_author = "VMware, Inc."
|
||||
epub_publisher = epub_author
|
||||
epub_copyright = copyright
|
||||
|
||||
epub_scheme = "URL"
|
||||
epub_identifier = "http://saltstack.com/"
|
||||
epub_identifier = "http://saltproject.io/"
|
||||
|
||||
epub_tocdup = False
|
||||
# epub_tocdepth = 3
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ There is much argument over the actual definition of "open core". From our stan
|
|||
|
||||
1. It is a standalone product that anyone is free to use.
|
||||
2. It is developed in the open with contributions accepted from the community for the good of the project.
|
||||
3. There are no features of Salt itself that are restricted to separate proprietary products distributed by SaltStack, Inc.
|
||||
3. There are no features of Salt itself that are restricted to separate proprietary products distributed by VMware, Inc.
|
||||
4. Because of our Apache 2.0 license, Salt can be used as the foundation for a project or even a proprietary tool.
|
||||
5. Our APIs are open and documented (any lack of documentation is an oversight as opposed to an intentional decision by SaltStack the company) and available for use by anyone.
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ This guide is intended for system and network administrators with the general
|
|||
knowledge and experience required in the field. This guide is also intended for
|
||||
users that have ideally already tested and used standard Salt proxy minions in
|
||||
their environment before deciding to move to a delta proxy minion environment.
|
||||
See `Salt proxy minions <https://docs.saltstack.com/en/latest/topics/proxyminion/index.html>`_ for more information.
|
||||
See `Salt proxy minions <https://docs.saltproject.io/en/latest/topics/proxyminion/index.html>`_ for more information.
|
||||
|
||||
.. Note::
|
||||
If you have not used standard Salt proxy minions before, consider testing
|
||||
|
|
@ -24,7 +24,7 @@ See `Salt proxy minions <https://docs.saltstack.com/en/latest/topics/proxyminion
|
|||
Proxy minions vs. delta proxy minions
|
||||
=====================================
|
||||
Salt can target network devices through `Salt proxy minions
|
||||
<https://docs.saltstack.com/en/latest/topics/proxyminion/index.html>`_,
|
||||
<https://docs.saltproject.io/en/latest/topics/proxyminion/index.html>`_,
|
||||
Proxy minions allow you to control network devices that, for whatever reason,
|
||||
cannot run the standard Salt minion. Examples include:
|
||||
|
||||
|
|
@ -49,10 +49,10 @@ memory to run commands when needed.
|
|||
For more information about Salt proxy minions, see:
|
||||
|
||||
* `Salt proxy minions
|
||||
<https://docs.saltstack.com/en/latest/topics/proxyminion/index.html>`_
|
||||
<https://docs.saltproject.io/en/latest/topics/proxyminion/index.html>`_
|
||||
|
||||
* `Salt proxy modules
|
||||
<https://docs.saltstack.com/en/latest/ref/proxy/all/index.html#all-salt-proxy>`_
|
||||
<https://docs.saltproject.io/en/latest/ref/proxy/all/index.html#all-salt-proxy>`_
|
||||
|
||||
|
||||
When delta proxy minions are needed
|
||||
|
|
@ -146,9 +146,9 @@ Before installing the delta proxy minion, ensure that:
|
|||
Install or upgrade Salt
|
||||
-----------------------
|
||||
Ensure your Salt masters are running at least Salt version 3004. For instructions
|
||||
on installing or upgrading Salt, see `repo.saltstack.com
|
||||
<http://repo.saltstack.com/>`_. For RedHat systems, see `Install or Upgrade Salt
|
||||
<https://enterprise.saltstack.com/en/latest/docs/install-salt.html>`_.
|
||||
on installing or upgrading Salt, see `repo.saltproject.io
|
||||
<http://repo.saltproject.io/>`_. For RedHat systems, see `Install or Upgrade Salt
|
||||
<https://enterprise.saltproject.io/en/latest/docs/install-salt.html>`_.
|
||||
|
||||
|
||||
|
||||
|
|
@ -284,9 +284,9 @@ file on the Salt master. To create this file:
|
|||
the type of device you need to manage. See:
|
||||
|
||||
* `Salt proxy modules
|
||||
<https://docs.saltstack.com/en/latest/ref/proxy/all/index.html#all-salt-proxy>`_
|
||||
<https://docs.saltproject.io/en/latest/ref/proxy/all/index.html#all-salt-proxy>`_
|
||||
* `Netmiko Salt proxy module
|
||||
<https://docs.saltstack.com/en/latest/ref/proxy/all/salt.proxy.netmiko_px.html#module-salt.proxy.netmiko_px>`_
|
||||
<https://docs.saltproject.io/en/latest/ref/proxy/all/salt.proxy.netmiko_px.html#module-salt.proxy.netmiko_px>`_
|
||||
|
||||
#. Save the file.
|
||||
|
||||
|
|
@ -417,11 +417,11 @@ This reference section includes additional resources for delta proxy minions.
|
|||
For reference, see:
|
||||
|
||||
* `Salt proxy minions
|
||||
<https://docs.saltstack.com/en/latest/topics/proxyminion/index.html>`_
|
||||
<https://docs.saltproject.io/en/latest/topics/proxyminion/index.html>`_
|
||||
|
||||
* `Salt proxy modules
|
||||
<https://docs.saltstack.com/en/latest/ref/proxy/all/index.html#all-salt-proxy>`_
|
||||
<https://docs.saltproject.io/en/latest/ref/proxy/all/index.html#all-salt-proxy>`_
|
||||
|
||||
* `Netmiko Salt proxy module
|
||||
<https://docs.saltstack.com/en/latest/ref/proxy/all/salt.proxy.netmiko_px.html#module-salt.proxy.netmiko_px>`_
|
||||
<https://docs.saltproject.io/en/latest/ref/proxy/all/salt.proxy.netmiko_px.html#module-salt.proxy.netmiko_px>`_
|
||||
|
||||
|
|
|
|||
|
|
@ -200,20 +200,20 @@ Salt Bootstrap can be updated automatically with ``salt-cloud``:
|
|||
|
||||
Bear in mind that this updates to the latest **stable** version from:
|
||||
|
||||
https://bootstrap.saltstack.com/stable/bootstrap-salt.sh
|
||||
https://bootstrap.saltproject.io/stable/bootstrap-salt.sh
|
||||
|
||||
To update Salt Bootstrap script to the **develop** version, run the following
|
||||
command on the Salt minion host with ``salt-cloud`` installed:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt-call config.gather_bootstrap_script 'https://bootstrap.saltstack.com/develop/bootstrap-salt.sh'
|
||||
salt-call config.gather_bootstrap_script 'https://bootstrap.saltproject.io/develop/bootstrap-salt.sh'
|
||||
|
||||
Or just download the file manually:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
curl -L 'https://bootstrap.saltstack.com/develop' > /etc/salt/cloud.deploy.d/bootstrap-salt.sh
|
||||
curl -L 'https://bootstrap.saltproject.io/develop' > /etc/salt/cloud.deploy.d/bootstrap-salt.sh
|
||||
|
||||
|
||||
Keeping /tmp/ Files
|
||||
|
|
|
|||
|
|
@ -568,8 +568,8 @@ See implementation details in `tests.support.helpers` for details.
|
|||
within a test case. See implementation details in `tests.support.helpers` for details.
|
||||
|
||||
|
||||
.. _kitchen-salt jenkins setup: https://kitchen.saltstack.com/docs/file/docs/jenkins.md
|
||||
.. _getting started: https://kitchen.saltstack.com/docs/file/docs/gettingstarted.md
|
||||
.. _kitchen-salt jenkins setup: https://kitchen.saltproject.io/docs/file/docs/jenkins.md
|
||||
.. _getting started: https://kitchen.saltproject.io/docs/file/docs/gettingstarted.md
|
||||
.. _salt-jenkins: https://github.com/saltstack/salt-jenkins
|
||||
.. _Kitchen Salt: https://kitchen.saltstack.com/
|
||||
.. _Kitchen Salt: https://kitchen.saltproject.io/
|
||||
.. _pytest: https://docs.pytest.org/en/latest/usage.html#specifying-tests-selecting-tests
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
!define PRODUCT_NAME "Salt Minion"
|
||||
!define PRODUCT_NAME_OTHER "Salt"
|
||||
!define PRODUCT_PUBLISHER "SaltStack, Inc"
|
||||
!define PRODUCT_PUBLISHER "VMware, Inc"
|
||||
!define PRODUCT_WEB_SITE "http://saltstack.org"
|
||||
!define PRODUCT_CALL_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\salt-call.exe"
|
||||
!define PRODUCT_CP_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\salt-cp.exe"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
:: COPYRIGHT: (c) 2012-2018 by the SaltStack Team
|
||||
::
|
||||
:: LICENSE: Apache 2.0
|
||||
:: ORGANIZATION: SaltStack, Inc (saltstack.com)
|
||||
:: ORGANIZATION: VMware, Inc (saltstack.com)
|
||||
:: CREATED: 2017
|
||||
::
|
||||
:: ############################################################################
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ def _sync(form, saltenv=None, extmod_whitelist=None, extmod_blacklist=None):
|
|||
def update(version=None):
|
||||
"""
|
||||
Update the salt minion from the URL defined in opts['update_url']
|
||||
SaltStack, Inc provides the latest builds here:
|
||||
VMware, Inc provides the latest builds here:
|
||||
update_url: https://repo.saltproject.io/windows/
|
||||
|
||||
Be aware that as of 2014-8-11 there's a bug in esky such that only the
|
||||
|
|
|
|||
|
|
@ -323,17 +323,17 @@ def banner(
|
|||
|
||||
.. code-block:: jinja
|
||||
|
||||
{{ set copyright='This file may not be copied or distributed without permission of SaltStack, Inc.' }}
|
||||
{{ salt['slsutil.banner'](title='Copyright 2019 SaltStack, Inc.', text=copyright, width=60) }}
|
||||
{{ set copyright='This file may not be copied or distributed without permission of VMware, Inc.' }}
|
||||
{{ salt['slsutil.banner'](title='Copyright 2019 VMware, Inc.', text=copyright, width=60) }}
|
||||
|
||||
.. code-block:: none
|
||||
|
||||
############################################################
|
||||
# #
|
||||
# Copyright 2019 SaltStack, Inc. #
|
||||
# Copyright 2019 VMware, Inc. #
|
||||
# #
|
||||
# This file may not be copied or distributed without #
|
||||
# permission of SaltStack, Inc. #
|
||||
# permission of VMware, Inc. #
|
||||
############################################################
|
||||
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
from base
|
||||
MAINTAINER SaltStack, Inc.
|
||||
MAINTAINER VMware, Inc.
|
||||
|
||||
RUN /bin/echo "The cheese shop is open" > /tmp/cheese
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue