From 335404d011aa3b09be265d5ad2e9b2334da505aa Mon Sep 17 00:00:00 2001 From: Alyssa Rock Date: Fri, 5 Jan 2024 18:17:55 +0000 Subject: [PATCH 01/17] Sync the 3006 branch to main --- docs/topics/install-by-operating-system/ubuntu.rst | 12 ++++++------ docs/topics/quickstart.rst | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/topics/install-by-operating-system/ubuntu.rst b/docs/topics/install-by-operating-system/ubuntu.rst index 0cdf8cc..94b25bc 100644 --- a/docs/topics/install-by-operating-system/ubuntu.rst +++ b/docs/topics/install-by-operating-system/ubuntu.rst @@ -117,7 +117,7 @@ arm64 architecture: sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu22-latest-gpg-arm64|\ - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |ubuntu22-latest-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=arm64] \ |ubuntu22-latest-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list .. include:: ../_includes/gpg-keys.rst @@ -130,7 +130,7 @@ arm64 architecture: sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu22-major-gpg-arm64|\ - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |ubuntu22-major-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=arm64] \ |ubuntu22-major-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list .. include:: ../_includes/gpg-keys.rst @@ -143,7 +143,7 @@ arm64 architecture: sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu22-minor-gpg-arm64|\ - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |ubuntu22-minor-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=arm64] \ |ubuntu22-minor-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list .. include:: ../_includes/gpg-keys.rst @@ -285,7 +285,7 @@ arm64 architecture: sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu20-latest-gpg-arm64|\ - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |ubuntu20-latest-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=arm64] \ |ubuntu20-latest-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list .. include:: ../_includes/gpg-keys.rst @@ -300,7 +300,7 @@ arm64 architecture: sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu20-major-gpg-arm64|\ - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |ubuntu20-major-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=arm64] \ |ubuntu20-major-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list .. include:: ../_includes/gpg-keys.rst @@ -315,7 +315,7 @@ arm64 architecture: sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu20-minor-gpg-arm64|\ - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |ubuntu20-minor-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=arm64] \ |ubuntu20-minor-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list .. include:: ../_includes/gpg-keys.rst diff --git a/docs/topics/quickstart.rst b/docs/topics/quickstart.rst index 80b22fc..eb33162 100644 --- a/docs/topics/quickstart.rst +++ b/docs/topics/quickstart.rst @@ -291,7 +291,7 @@ it to many nodes. In the classic Salt infrastructure, a node running the ``salt-master`` agent can rapidly issue commands to many nodes at the same time as long as those nodes -are running the `salt-minion` agent. +are running the ``salt-minion`` agent. In this exercise: From 5b436f3fd1c55552d4c00e8b61e6247eb6478449 Mon Sep 17 00:00:00 2001 From: Alyssa Rock Date: Wed, 24 Jan 2024 18:55:30 +0000 Subject: [PATCH 02/17] Sync 3006 branch with main --- .brokignore | 11 + docs/index.rst | 1 + .../_includes/previous-version-note.rst | 7 + docs/topics/quickstart.rst | 4 +- docs/topics/revert-to-previous-version.rst | 201 ++++++++++++++++++ 5 files changed, 222 insertions(+), 2 deletions(-) create mode 100644 docs/topics/_includes/previous-version-note.rst create mode 100644 docs/topics/revert-to-previous-version.rst diff --git a/.brokignore b/.brokignore index 8c88080..67dc032 100644 --- a/.brokignore +++ b/.brokignore @@ -10,9 +10,20 @@ https://example.com https://example.org https://gitlab.com/saltstack/open/docs/salt-install-guide/-/forks/new https://repo.saltproject.io/py3/amazon/2/x86_64/3001.repo +https://repo.saltproject.io/salt/py3/debian/10/amd64/minor/3006.X +https://repo.saltproject.io/salt/py3/debian/11/amd64/minor/3006.X +https://repo.saltproject.io/salt/py3/debian/12/amd64/minor/3006.X +https://repo.saltproject.io/salt/py3/redhat/7/x86_64/minor/3006.X.repo +https://repo.saltproject.io/salt/py3/redhat/8/x86_64/minor/3006.X.repo +https://repo.saltproject.io/salt/py3/redhat/9/x86_64/minor/3006.X.repo +https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/minor/3006.X +https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/minor/3006.X +https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/minor/3006.X +https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/minor/3006.X https://saltstack.gitlab.io/open/docs/salt-install-guide https://twitter.com/intent/follow?screen_name=Salt_Project_OS https://www.example.com https://www.example.org https://www.reddit.com/r/saltstack +https://www.weforum.org/agenda/2020/03/coronavirus-pandemic-cybersecurity/ https://your-GitLab-username.gitlab.io diff --git a/docs/index.rst b/docs/index.rst index ff056e4..61ac2f0 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -37,6 +37,7 @@ Install Salt topics/verify-install topics/install-dependencies topics/uninstall + topics/revert-to-previous-version .. toctree:: :maxdepth: 2 diff --git a/docs/topics/_includes/previous-version-note.rst b/docs/topics/_includes/previous-version-note.rst new file mode 100644 index 0000000..4257d2f --- /dev/null +++ b/docs/topics/_includes/previous-version-note.rst @@ -0,0 +1,7 @@ +.. Note:: + For RedHat ARM64 platforms, replace ``x86_64`` with ``aarch64``. + + For Ubuntu ARM64 platforms, replace ``amd64`` with ``arm64``. + + There's no need to change the GPG keys because you can use the same GPG keys + you used when installing Salt the first time. diff --git a/docs/topics/quickstart.rst b/docs/topics/quickstart.rst index eb33162..63ef6fd 100644 --- a/docs/topics/quickstart.rst +++ b/docs/topics/quickstart.rst @@ -563,7 +563,7 @@ To complete the exercise: .. code-block:: bash - sudo salt-call state.apply example-state-file + salt-call state.apply example-state-file When you run this command, you should see output similar to this: @@ -707,7 +707,7 @@ To complete the exercise: .. code-block:: bash - sudo salt-call state.apply example-state-file + salt-call state.apply example-state-file When you run this command, you should see output similar to this: diff --git a/docs/topics/revert-to-previous-version.rst b/docs/topics/revert-to-previous-version.rst new file mode 100644 index 0000000..b3b671b --- /dev/null +++ b/docs/topics/revert-to-previous-version.rst @@ -0,0 +1,201 @@ +.. _revert-to-previous-version: + +==================================== +Revert to a previous version of Salt +==================================== + +This documentation explains how to revert to a previous version of Salt on these +operating systems: + +* `Revert Salt on Debian/Ubuntu operating systems`_ +* `Revert Salt on RedHat operating systems`_ + + +Revert Salt on Debian/Ubuntu operating systems +============================================== +To revert to a previous version of Salt: + +#. Verify the version of Salt you are running. For example: + + .. code-block:: bash + + salt-call --local test.versions + salt minion test.version + salt-run --versions-report + + Example output: + + .. code-block:: bash + + minion: + 3006.5 + +#. Run the following command to overwrite the ``salt.list`` file and pin your + version of Salt to a previous minor version, replacing the ``X`` in this + example with the desired previous version number: + + .. tab-set:: + + .. tab-item:: Debian 12 + + .. code-block:: bash + + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/debian/12/amd64/minor/3006.X bookworm main" | sudo tee /etc/apt/sources.list.d/salt.list + + .. include:: _includes/previous-version-note.rst + + .. tab-item:: Debian 11 + + .. code-block:: bash + + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/debian/11/amd64/minor/3006.X bullseye main" | sudo tee /etc/apt/sources.list.d/salt.list + + .. include:: _includes/previous-version-note.rst + + .. tab-item:: Debian 10 + + .. code-block:: bash + + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/debian/10/amd64/minor/3006.X buster main" | sudo tee /etc/apt/sources.list.d/salt.list + + .. include:: _includes/previous-version-note.rst + + + .. tab-item:: Ubuntu 22.04 + + .. code-block:: bash + + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/minor/3006.X jammy main" | sudo tee /etc/apt/sources.list.d/salt.list + + + .. include:: _includes/previous-version-note.rst + + + .. tab-item:: Ubuntu 20.04 + + .. code-block:: bash + + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/minor/3006.X focal main" | sudo tee /etc/apt/sources.list.d/salt.list + + .. include:: _includes/previous-version-note.rst + + +#. Run the following command to change your version of Salt and remove all Salt + services: + + .. code-block:: bash + + apt remove salt-common + + +#. Run the following commands to update your package manager and install any of + the Salt services as needed: + + .. code-block:: bash + + apt update + apt-get install salt-master + apt-get install salt-minion + apt-get install salt-ssh + apt-get install salt-syndic + apt-get install salt-cloud + apt-get install salt-api + +#. Verify the version of Salt you are running to ensure you are on the previous + version. For example: + + .. code-block:: bash + + salt-call test.version + salt minion test.version + salt-run --versions-report + + + +Revert Salt on RedHat operating systems +======================================= +To revert to a previous version of Salt: + +#. Verify the version of Salt you are running. For example: + + .. code-block:: bash + + salt-call --local test.versions + salt minion test.version + salt-run --versions-report + + Example output: + + .. code-block:: bash + + minion: + 3006.5 + +#. Run the following command to overwrite the ``salt.list`` file and pin your + version of Salt to a previous minor version, replacing the ``X`` in this + example with the desired previous version number: + + .. tab-set:: + + .. tab-item:: RHEL 9 + + .. code-block:: bash + + curl -fsSL https://repo.saltproject.io/salt/py3/redhat/9/x86_64/minor/3006.X.repo | sudo tee /etc/yum.repos.d/salt.repo + + .. include:: _includes/previous-version-note.rst + + .. tab-item:: RHEL 8 + + .. code-block:: bash + + curl -fsSL https://repo.saltproject.io/salt/py3/redhat/8/x86_64/minor/3006.X.repo | sudo tee /etc/yum.repos.d/salt.repo + + .. include:: _includes/previous-version-note.rst + + .. tab-item:: RHEL 7 + + .. code-block:: bash + + curl -fsSL https://repo.saltproject.io/salt/py3/redhat/7/x86_64/minor/3006.X.repo | sudo tee /etc/yum.repos.d/salt.repo + + .. include:: _includes/previous-version-note.rst + +#. Run the following command to change your version of Salt and remove all Salt + services: + + .. code-block:: bash + + yum remove salt + +#. Update your package manager and install any of the Salt services as needed: + + .. code-block:: bash + + yum makecache + yum install salt-master + yum install salt-minion + yum install salt-ssh + yum install salt-syndic + yum install salt-cloud + yum install salt-api + +#. Restart the salt services: + + .. code-block:: bash + + systemctl restart salt-master + systemctl restart salt-minion + systemctl restart salt-ssh + systemctl restart salt-syndic + systemctl restart salt-cloud + systemctl restart salt-api + +#. Verify the version of Salt you are running to ensure you are on the previous + version. For example: + + .. code-block:: bash + + salt-call --local test.versions + salt minion test.version + salt-run --versions-report From c3f94b1a6f6c8095de901aabe5e26be660285f24 Mon Sep 17 00:00:00 2001 From: Alyssa Rock Date: Tue, 30 Jan 2024 21:50:04 +0000 Subject: [PATCH 03/17] Sync main 3006 --- docs/index.rst | 4 +--- .../{ => other-install-types}/air-gap-install.rst | 2 +- docs/topics/other-install-types/index.rst | 14 ++++++++++++++ .../platform-agnostic.rst | 2 +- .../release-candidate.rst | 2 +- 5 files changed, 18 insertions(+), 6 deletions(-) rename docs/topics/{ => other-install-types}/air-gap-install.rst (97%) create mode 100644 docs/topics/other-install-types/index.rst rename docs/topics/{ => other-install-types}/platform-agnostic.rst (96%) rename docs/topics/{ => other-install-types}/release-candidate.rst (99%) diff --git a/docs/index.rst b/docs/index.rst index 61ac2f0..319dcdc 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -22,9 +22,7 @@ Install Salt topics/before-you-start/index topics/install-by-operating-system/index topics/bootstrap - topics/platform-agnostic - topics/air-gap-install - topics/release-candidate + topics/other-install-types/index .. toctree:: :maxdepth: 2 diff --git a/docs/topics/air-gap-install.rst b/docs/topics/other-install-types/air-gap-install.rst similarity index 97% rename from docs/topics/air-gap-install.rst rename to docs/topics/other-install-types/air-gap-install.rst index fae18a9..f9b772c 100644 --- a/docs/topics/air-gap-install.rst +++ b/docs/topics/other-install-types/air-gap-install.rst @@ -4,7 +4,7 @@ Install in air-gapped environments ================================== -.. include:: _includes/install-method.rst +.. include:: ../_includes/install-method.rst About air-gapped installations diff --git a/docs/topics/other-install-types/index.rst b/docs/topics/other-install-types/index.rst new file mode 100644 index 0000000..ac3009b --- /dev/null +++ b/docs/topics/other-install-types/index.rst @@ -0,0 +1,14 @@ +.. _additional-installation-types-index: + +======================== +Other installation types +======================== + +The following instructions provide explanations about additional installation +scenarios: + +.. toctree:: + :maxdepth: 1 + :glob: + + * diff --git a/docs/topics/platform-agnostic.rst b/docs/topics/other-install-types/platform-agnostic.rst similarity index 96% rename from docs/topics/platform-agnostic.rst rename to docs/topics/other-install-types/platform-agnostic.rst index 6da6eda..0aefdac 100644 --- a/docs/topics/platform-agnostic.rst +++ b/docs/topics/other-install-types/platform-agnostic.rst @@ -4,7 +4,7 @@ Platform agnostic installation (pip) ==================================== -.. include:: _includes/install-method.rst +.. include:: ../_includes/install-method.rst About platform agonistic installation diff --git a/docs/topics/release-candidate.rst b/docs/topics/other-install-types/release-candidate.rst similarity index 99% rename from docs/topics/release-candidate.rst rename to docs/topics/other-install-types/release-candidate.rst index c10503f..15278ba 100644 --- a/docs/topics/release-candidate.rst +++ b/docs/topics/other-install-types/release-candidate.rst @@ -44,7 +44,7 @@ To install release candidate packages: the package to a specific version of Salt, after ``https://repo.saltproject.io`` insert ``salt_rc/`` before the remainder of the file path. - .. include:: _includes/gpg-keys.rst + .. include:: ../_includes/gpg-keys.rst To install the latest RC, run the following commands: From f8136b90cb633935d1b7a03ebe7ecf2aa2557f24 Mon Sep 17 00:00:00 2001 From: Alyssa Rock Date: Wed, 31 Jan 2024 22:33:50 +0000 Subject: [PATCH 04/17] Prep announcement for 3006.6 and 3005.5 release [3006 BRANCH] --- docs/topics/announcements.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/announcements.rst b/docs/topics/announcements.rst index 4874a95..e4fdc7b 100644 --- a/docs/topics/announcements.rst +++ b/docs/topics/announcements.rst @@ -18,6 +18,8 @@ Announcements Release announcements ===================== +* **January 31:** `3006.6 `_ is now available. +* **January 31:** `3005.5 `_ is now available. * **December 12:** `3006.5 `_ is now available. * **October 27:** `3006.4 `_ is now available. * **October 27:** `3005.4 ` is now available. From 4884573ba0434d0bdc3259e0fc99db3068ce5fd5 Mon Sep 17 00:00:00 2001 From: Alyssa Rock Date: Wed, 21 Feb 2024 19:16:55 +0000 Subject: [PATCH 05/17] Add 3006.7 announcement to 3006 branch --- docs/topics/announcements.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/topics/announcements.rst b/docs/topics/announcements.rst index e4fdc7b..f1bfd09 100644 --- a/docs/topics/announcements.rst +++ b/docs/topics/announcements.rst @@ -18,11 +18,12 @@ Announcements Release announcements ===================== +* **February 21:** `3006.7 `_ is now available. * **January 31:** `3006.6 `_ is now available. * **January 31:** `3005.5 `_ is now available. * **December 12:** `3006.5 `_ is now available. * **October 27:** `3006.4 `_ is now available. -* **October 27:** `3005.4 ` is now available. +* **October 27:** `3005.4 `_ is now available. * **September 21, 2023:** `3005.3 `_ is now available. * **September 7, 2023:** `3006.3 `_ is now available. * **August 10, 2023:** `3006.2 `_ is now available. From 5e55116ea282cc834b6276d31348847bc439a4f3 Mon Sep 17 00:00:00 2001 From: Alyssa Rock Date: Wed, 6 Mar 2024 19:43:00 +0000 Subject: [PATCH 06/17] Prep 3007 for 3006 branch --- .gitlab-ci.yml | 26 ++++++++++++++++++----- docs/topics/announcements.rst | 39 ++++++++++++++++++----------------- 2 files changed, 41 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f2b74c..39ace93 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,19 +37,19 @@ pre-commit: - pre-commit install - pre-commit run -a -v --color always -build-site-3006: +build-site-3007: stage: build image: python:3.11 script: - - git checkout v3006.0 + - git checkout v3007 - pip install -U pip setuptools wheel nox - nox -e 'docs-html(download_versions=True, clean=True)' - mkdir -p html/en/ - - mv docs/_build/html html/en/3006 + - mv docs/_build/html html/en/3007 # The following section should only exist on the build meant to be latest build # Make sure to modify the first line to target the latest version - | - cp -r html/en/3006 html/en/latest + cp -r html/en/3007 html/en/latest echo '' > docs/redirector.html echo " @@ -66,6 +66,22 @@ build-site-3006: rules: - if: '$CI_PROJECT_PATH == $CICD_UPSTREAM_PATH' +build-site-3006: + stage: build + image: python:3.11 + script: + - git checkout v3006.0 + - pip install -U pip setuptools wheel nox + - nox -e 'docs-html(download_versions=True, clean=True)' + - mkdir -p html/en/ + - mv docs/_build/html html/en/3006 + artifacts: + paths: + - html + expire_in: 1 days + rules: + - if: '$CI_PROJECT_PATH == $CICD_UPSTREAM_PATH' + build-site-3005: stage: build image: python:3.11 @@ -125,7 +141,7 @@ build-site-fork: - html expire_in: 1 days rules: - - if: '$CI_COMMIT_BRANCH != "main" && $CI_COMMIT_BRANCH != "v3006.0" && $CI_COMMIT_BRANCH != "v3005" && $CI_PROJECT_PATH != $CICD_UPSTREAM_PATH' + - if: '$CI_COMMIT_BRANCH != "main" && $CI_COMMIT_BRANCH != "v3007" && $CI_COMMIT_BRANCH != "v3006.0" && $CI_COMMIT_BRANCH != "v3005" && $CI_PROJECT_PATH != $CICD_UPSTREAM_PATH' url-tester-brok: stage: url-test diff --git a/docs/topics/announcements.rst b/docs/topics/announcements.rst index f1bfd09..dc28741 100644 --- a/docs/topics/announcements.rst +++ b/docs/topics/announcements.rst @@ -15,25 +15,6 @@ Announcements :class-container: sd-p-2 sd-outline-muted sd-rounded-1 -Release announcements -===================== - -* **February 21:** `3006.7 `_ is now available. -* **January 31:** `3006.6 `_ is now available. -* **January 31:** `3005.5 `_ is now available. -* **December 12:** `3006.5 `_ is now available. -* **October 27:** `3006.4 `_ is now available. -* **October 27:** `3005.4 `_ is now available. -* **September 21, 2023:** `3005.3 `_ is now available. -* **September 7, 2023:** `3006.3 `_ is now available. -* **August 10, 2023:** `3006.2 `_ is now available. -* **August 10, 2023:** `3005.2 `_ is now available. -* **May 5, 2023:** `3006.1 `_ is now available. -* **April 18, 2023:** `3006.0 `_ is now available. -* **October 4, 2022:** `3005.1 `_ is now available. -* **August 25, 2022:** `3005 `_ is now available. - - Security announcements ====================== @@ -43,3 +24,23 @@ for the latest announcements. .. Important:: To be notified of the latest security updates, subscribe to the `Salt security announcements RSS feed `_. + + +Release announcements +===================== + +* **March 6, 2024:** `3007.0 `_ is now available. +* **February 21, 2024:** `3006.7 `_ is now available. +* **January 31, 2024:** `3006.6 `_ is now available. +* **January 31, 2024:** `3005.5 `_ is now available. +* **December 12, 2023:** `3006.5 `_ is now available. +* **October 27, 2023:** `3006.4 `_ is now available. +* **October 27, 2023:** `3005.4 `_ is now available. +* **September 21, 2023:** `3005.3 `_ is now available. +* **September 7, 2023:** `3006.3 `_ is now available. +* **August 10, 2023:** `3006.2 `_ is now available. +* **August 10, 2023:** `3005.2 `_ is now available. +* **May 5, 2023:** `3006.1 `_ is now available. +* **April 18, 2023:** `3006.0 `_ is now available. +* **October 4, 2022:** `3005.1 `_ is now available. +* **August 25, 2022:** `3005 `_ is now available. From f9f83b4fccf6d0d5ecab77d9ec6347a5f1903c9d Mon Sep 17 00:00:00 2001 From: Felippe Burk Date: Wed, 6 Mar 2024 14:38:36 -0700 Subject: [PATCH 07/17] removing 3005 and fixing other urls --- .brokignore | 1 + .gitlab-ci.yml | 16 ---------------- docs/_templates/sitevars.rst | 2 +- docs/topics/announcements.rst | 2 +- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/.brokignore b/.brokignore index 67dc032..eda4997 100644 --- a/.brokignore +++ b/.brokignore @@ -6,6 +6,7 @@ http://saltproject.io http://www.example.com http://www.example.org https://archive.repo.saltproject.io +https://docs.saltproject.io/salt/install-guide/en/3007 https://example.com https://example.org https://gitlab.com/saltstack/open/docs/salt-install-guide/-/forks/new diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39ace93..18e79e0 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,22 +82,6 @@ build-site-3006: rules: - if: '$CI_PROJECT_PATH == $CICD_UPSTREAM_PATH' -build-site-3005: - stage: build - image: python:3.11 - script: - - git checkout v3005 - - pip install -U pip setuptools wheel nox - - nox -e 'docs-html(download_versions=True, clean=True)' - - mkdir -p html/en/ - - mv docs/_build/html html/en/3005 - artifacts: - paths: - - html - expire_in: 1 days - rules: - - if: '$CI_PROJECT_PATH == $CICD_UPSTREAM_PATH' - build-site-main: stage: build image: python:3.11 diff --git a/docs/_templates/sitevars.rst b/docs/_templates/sitevars.rst index 9b89a2b..63227e3 100644 --- a/docs/_templates/sitevars.rst +++ b/docs/_templates/sitevars.rst @@ -1,5 +1,5 @@ .. |release| replace:: CURRENT_MINOR -.. |current-major-version| replace:: 3006 +.. |current-major-version| replace:: 3007 .. |supported-release-1| replace:: LATEST_MINOR .. |supported-release-2| replace:: OLD_MINOR .. |supported-release-3| replace:: OLDEST_MINOR diff --git a/docs/topics/announcements.rst b/docs/topics/announcements.rst index dc28741..bd87b39 100644 --- a/docs/topics/announcements.rst +++ b/docs/topics/announcements.rst @@ -41,6 +41,6 @@ Release announcements * **August 10, 2023:** `3006.2 `_ is now available. * **August 10, 2023:** `3005.2 `_ is now available. * **May 5, 2023:** `3006.1 `_ is now available. -* **April 18, 2023:** `3006.0 `_ is now available. +* **April 18, 2023:** `3006.0 `_ is now available. * **October 4, 2022:** `3005.1 `_ is now available. * **August 25, 2022:** `3005 `_ is now available. From c9cfc706d2a134de144f3041a97e60d25959f51e Mon Sep 17 00:00:00 2001 From: Derek <4846166-ScriptAutomate@users.noreply.gitlab.com> Date: Thu, 7 Mar 2024 18:03:09 +0000 Subject: [PATCH 08/17] 3006 branch should use 3006 major version --- docs/_templates/sitevars.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/_templates/sitevars.rst b/docs/_templates/sitevars.rst index 63227e3..31045bb 100644 --- a/docs/_templates/sitevars.rst +++ b/docs/_templates/sitevars.rst @@ -1,5 +1,5 @@ .. |release| replace:: CURRENT_MINOR -.. |current-major-version| replace:: 3007 +.. |current-major-version| replace:: 3006 .. |supported-release-1| replace:: LATEST_MINOR .. |supported-release-2| replace:: OLD_MINOR .. |supported-release-3| replace:: OLDEST_MINOR @@ -161,9 +161,9 @@ .. |fedora37-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub .. |fedora37-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/arm64/minor/CURRENT_MINOR.repo -.. |macos-amd64-download| replace:: https://repo.saltproject.io/salt/py3/macos/latest/salt-CURRENT_MINOR-py3-x86_64.pkg +.. |macos-amd64-download| replace:: https://repo.saltproject.io/salt/py3/macos/CURRENT_MAJOR/salt-CURRENT_MINOR-py3-x86_64.pkg .. |macos-amd64-gpg| replace:: https://repo.saltproject.io/salt/py3/macos/SALT-PROJECT-GPG-PUBKEY-2023.gpg -.. |macos-arm64-download| replace:: https://repo.saltproject.io/salt/py3/macos/latest/salt-CURRENT_MINOR-py3-arm64.pkg +.. |macos-arm64-download| replace:: https://repo.saltproject.io/salt/py3/macos/CURRENT_MAJOR/salt-CURRENT_MINOR-py3-arm64.pkg .. |photonos5-latest-gpg| replace:: https://repo.saltproject.io/salt/py3/photon/5.0/x86_64/latest/SALT-PROJECT-GPG-PUBKEY-2023.pub .. |photonos5-latest-download| replace:: https://repo.saltproject.io/salt/py3/photon/5.0/x86_64/latest.repo @@ -260,4 +260,4 @@ .. |windows-install-msi-example| replace:: Salt-Minion-CURRENT_MINOR-Py3-AMD64.msi .. |windows-amd64-exe-gpg| replace:: https://repo.saltproject.io/salt/py3/windows/SALT-PROJECT-GPG-PUBKEY-2023.gpg -.. |windows-amd64-exe-download| replace:: https://repo.saltproject.io/salt/py3/windows/latest/Salt-Minion-CURRENT_MINOR-Py3-AMD64-Setup.exe +.. |windows-amd64-exe-download| replace:: https://repo.saltproject.io/salt/py3/windows/CURRENT_MAJOR/Salt-Minion-CURRENT_MINOR-Py3-AMD64-Setup.exe From 315e7d75a8b3baad09b6132ee996464115b840c3 Mon Sep 17 00:00:00 2001 From: Alyssa Rock Date: Wed, 17 Apr 2024 13:36:57 -0600 Subject: [PATCH 09/17] Update Salt version support lifecycle page --- .../topics/salt-version-support-lifecycle.rst | 65 +++++++++++-------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/docs/topics/salt-version-support-lifecycle.rst b/docs/topics/salt-version-support-lifecycle.rst index a242b4f..5679f99 100644 --- a/docs/topics/salt-version-support-lifecycle.rst +++ b/docs/topics/salt-version-support-lifecycle.rst @@ -24,10 +24,25 @@ Version support lifecycle - `Active support`_ ends - `CVE and critical support`_ ends + * - 3007 STS + - March 6, 2024 + - October 18, 2024 + - October 18, 2024 + * - 3006 LTS - April 18, 2023 - - April 18, 2024 - - April 18, 2025 + - October 18, 2024 + - October 18, 2025 + +.. Note:: + Salt Project is committed to providing active support for the current LTS + release. There will always be at least one LTS release at a time. If + unforeseen circumstances cause delays in the timing of the next LTS + release, support for the current LTS release will be extended as needed. + + STS versions of Salt are actively supported until the date of the next LTS + or STS release. + See `Older version support lifecycle`_ for versions of Salt older than 3006. @@ -36,15 +51,19 @@ LTS/STS release and support policy ================================== Beginning with the 3006 release of Salt, the Salt Project will follow an LTS/STS release strategy. Under this strategy, the Salt Project will release one LTS -(long-term support) release of Salt per year and one STS (short-term support) -release each year. The LTS release will receive bug fix releases for a longer -period of time than STS releases. +(long-term support) release of Salt per year and one or more STS (short-term +support) release each year. The LTS release will receive bug fix releases for a +longer period of time than STS releases. The purpose of the LTS release is to provide users with a stable version of Salt for a longer period (2 years). The purpose of the STS release is to provide a feature release to users who need or prefer access to the latest features in between LTS releases. +.. Warning:: + If you are unsure whether to use the LTS or STS release, you should use the + LTS release. + .. list-table:: :widths: 30 35 35 :header-rows: 1 @@ -55,18 +74,24 @@ between LTS releases. - STS release * - Release schedule - - * Released once a year, usually in the first 4 months of the calendar - year + - * Released once a year * 1-2 release candidates in the months leading up to the release - * Point releases every 3 months after the GA release - - * Released once a year around the midpoint the year + * Regular bug/fix point releases as needed after GA release + - * Released in between LTS releases + * There may possibly be more than one at a time or no STS releases at a + given point in time * - Support schedule - - * Active support for 1 full year, including rolling updates of bug fixes - every quarter - * CVE and critical fixes support for an additional year - - * Active support for 3 months - * CVE and critical fixes support for an additional 3 months + - * Active support for at least a full year, including regular bug/fix + releases + * CVE and critical fixes support for an additional year after active + support ends + * Salt Project will always actively support at least one LTS release at a + time + * If unforeseen circumstances cause delays in the timing of the next LTS + release, support for the current LTS release will be extended as needed + - * Active support until the next LTS or STS release + * CVE and critical fixes support until the next LTS or STS release * - Development schedule - Features developed in the 6 months prior to release @@ -86,18 +111,6 @@ between LTS releases. access to the latest features -The following graphic shows an example of the LTS/STS release strategy timeline -for two years of the development and release cycle: - -.. image:: ../_static/img/salt-release-timeline.png - :alt: Graphic showing an LTS release that occurs between January and March - that is actively supported for a full year and then has CVE and - Critical support for an additional year. The graphic also shows an STS - release that occurs between July and September that is actively - supported for 3 months and then has CVE/Critical support for 3 - additional months. - - Support level definitions ========================= From 5eff3767133320ac61dc02440af19c04ad204e63 Mon Sep 17 00:00:00 2001 From: Alyssa Rock Date: Tue, 30 Apr 2024 18:41:48 +0000 Subject: [PATCH 10/17] Add announcements about 3006.8 to the 3006 branch --- docs/_templates/sitevars.rst | 47 +--- docs/topics/announcements.rst | 1 + .../install-by-operating-system/debian.rst | 172 ------------- .../install-by-operating-system/fedora.rst | 228 +++--------------- .../install-by-operating-system/photonos.rst | 116 --------- .../salt-supported-operating-systems.rst | 29 +-- 6 files changed, 47 insertions(+), 546 deletions(-) diff --git a/docs/_templates/sitevars.rst b/docs/_templates/sitevars.rst index 31045bb..89a78a5 100644 --- a/docs/_templates/sitevars.rst +++ b/docs/_templates/sitevars.rst @@ -133,33 +133,19 @@ .. |debian10-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/debian/10/arm64/SALT-PROJECT-GPG-PUBKEY-2023.gpg .. |debian10-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/debian/10/arm64/minor/CURRENT_MINOR buster main -.. |fedora38-latest-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/38/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora38-latest-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/38/x86_64/latest.repo -.. |fedora38-major-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/38/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora38-major-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/38/x86_64/CURRENT_MAJOR.repo -.. |fedora38-minor-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/38/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora38-minor-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/38/x86_64/minor/CURRENT_MINOR.repo - -.. |fedora38-latest-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/38/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora38-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/38/arm64/latest.repo -.. |fedora38-major-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/38/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora38-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/38/arm64/CURRENT_MAJOR.repo -.. |fedora38-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/38/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora38-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/38/arm64/minor/CURRENT_MINOR.repo - -.. |fedora37-latest-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora37-latest-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/x86_64/latest.repo -.. |fedora37-major-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora37-major-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/x86_64/CURRENT_MAJOR.repo -.. |fedora37-minor-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora37-minor-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/x86_64/minor/CURRENT_MINOR.repo - -.. |fedora37-latest-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora37-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/arm64/latest.repo -.. |fedora37-major-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora37-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/arm64/CURRENT_MAJOR.repo -.. |fedora37-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora37-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/37/arm64/minor/CURRENT_MINOR.repo +.. |fedora39-latest-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |fedora39-latest-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/x86_64/latest.repo +.. |fedora39-major-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |fedora39-major-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/x86_64/CURRENT_MAJOR.repo +.. |fedora39-minor-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |fedora39-minor-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/x86_64/minor/CURRENT_MINOR.repo + +.. |fedora39-latest-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |fedora39-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/arm64/latest.repo +.. |fedora39-major-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |fedora39-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/arm64/CURRENT_MAJOR.repo +.. |fedora39-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |fedora39-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/arm64/minor/CURRENT_MINOR.repo .. |macos-amd64-download| replace:: https://repo.saltproject.io/salt/py3/macos/CURRENT_MAJOR/salt-CURRENT_MINOR-py3-x86_64.pkg .. |macos-amd64-gpg| replace:: https://repo.saltproject.io/salt/py3/macos/SALT-PROJECT-GPG-PUBKEY-2023.gpg @@ -179,13 +165,6 @@ .. |photonos4-minor-gpg| replace:: https://repo.saltproject.io/salt/py3/photon/4.0/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub .. |photonos4-minor-download| replace:: https://repo.saltproject.io/salt/py3/photon/4.0/x86_64/minor/CURRENT_MINOR.repo -.. |photonos3-latest-gpg| replace:: https://repo.saltproject.io/salt/py3/photon/3.0/x86_64/latest/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |photonos3-latest-download| replace:: https://repo.saltproject.io/salt/py3/photon/3.0/x86_64/latest.repo -.. |photonos3-major-gpg| replace:: https://repo.saltproject.io/salt/py3/photon/3.0/x86_64/latest/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |photonos3-major-download| replace:: https://repo.saltproject.io/salt/py3/photon/3.0/x86_64/CURRENT_MAJOR.repo -.. |photonos3-minor-gpg| replace:: https://repo.saltproject.io/salt/py3/photon/3.0/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |photonos3-minor-download| replace:: https://repo.saltproject.io/salt/py3/photon/3.0/x86_64/minor/CURRENT_MINOR.repo - .. |rhel9-latest-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub .. |rhel9-latest-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/latest.repo .. |rhel9-major-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub diff --git a/docs/topics/announcements.rst b/docs/topics/announcements.rst index bd87b39..aa0962a 100644 --- a/docs/topics/announcements.rst +++ b/docs/topics/announcements.rst @@ -29,6 +29,7 @@ for the latest announcements. Release announcements ===================== +* **April 30, 2024:** `3006.8 `_ is now available. * **March 6, 2024:** `3007.0 `_ is now available. * **February 21, 2024:** `3006.7 `_ is now available. * **January 31, 2024:** `3006.6 `_ is now available. diff --git a/docs/topics/install-by-operating-system/debian.rst b/docs/topics/install-by-operating-system/debian.rst index 2296cbe..9d1f458 100644 --- a/docs/topics/install-by-operating-system/debian.rst +++ b/docs/topics/install-by-operating-system/debian.rst @@ -10,8 +10,6 @@ These instructions explain how to install Salt on Debian operating systems: * `Install Salt on Debian 12 (Bookworm) arm64`_ * `Install Salt on Debian 11 (Bullseye) amd64`_ * `Install Salt on Debian 11 (Bullseye) arm64`_ -* `Install Salt on Debian 10 (Buster) amd64`_ -* `Install Salt on Debian 10 (Buster) arm64`_ .. include:: ../_includes/what-is-onedir.rst @@ -358,176 +356,6 @@ arm64 architecture: .. include:: ../_includes/post-install-by-os.rst -Install Salt on Debian 10 (Buster) amd64 -=================================================== -To install the :ref:`onedir` packages of Salt on Debian 10 (Buster) for -amd64 architecture: - -#. Run the following commands to import the Salt Project repository key, and to - create the apt sources list file: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: Debian 10 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Debian 10 (Buster)**: - - .. parsed-literal:: - - mkdir /etc/apt/keyrings - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |debian10-latest-gpg-amd64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |debian10-latest-download-amd64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: Debian 10 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package - of Salt for **Debian 10 (Buster)**: - - .. parsed-literal:: - - mkdir /etc/apt/keyrings - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |debian10-major-gpg-amd64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |debian10-major-download-amd64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: Debian 10 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package - of Salt for **Debian 10 (Buster)**: - - .. parsed-literal:: - - mkdir /etc/apt/keyrings - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |debian10-minor-gpg-amd64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |debian10-minor-download-amd64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - -#. Run ``sudo apt-get update`` to update your packages. - -#. Install the salt-minion, salt-master, or other Salt components: - - .. code-block:: bash - - sudo apt-get install salt-master - sudo apt-get install salt-minion - sudo apt-get install salt-ssh - sudo apt-get install salt-syndic - sudo apt-get install salt-cloud - sudo apt-get install salt-api - -#. Enable and start the services for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst - - -Install Salt on Debian 10 (Buster) arm64 -==================================================== -To install the :ref:`onedir` packages of Salt on Debian 10 (Buster) for -arm64 architecture: - -#. Run the following commands to import the Salt Project repository key, and to - create the apt sources list file: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: Debian 10 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Debian 10 (Buster)**: - - .. parsed-literal:: - - mkdir /etc/apt/keyrings - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |debian10-latest-gpg-arm64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |debian10-latest-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: Debian 10 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package - of Salt for **Debian 10 (Buster)**: - - .. parsed-literal:: - - mkdir /etc/apt/keyrings - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |debian10-major-gpg-arm64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |debian10-major-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: Debian 10 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package - of Salt for **Debian 10 (Buster)**: - - .. parsed-literal:: - - mkdir /etc/apt/keyrings - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |debian10-minor-gpg-arm64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |debian10-minor-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - -#. Run ``sudo apt-get update`` to update your packages. - -#. Install the salt-minion, salt-master, or other Salt components: - - .. code-block:: bash - - sudo apt-get install salt-master - sudo apt-get install salt-minion - sudo apt-get install salt-ssh - sudo apt-get install salt-syndic - sudo apt-get install salt-cloud - sudo apt-get install salt-api - -#. Enable and start the services for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst - - Browse the repo =============== diff --git a/docs/topics/install-by-operating-system/fedora.rst b/docs/topics/install-by-operating-system/fedora.rst index a1216ad..f4b726b 100644 --- a/docs/topics/install-by-operating-system/fedora.rst +++ b/docs/topics/install-by-operating-system/fedora.rst @@ -6,19 +6,17 @@ Fedora These instructions explain how to install Salt on Fedora operating systems: -* `Install Salt on Fedora 38 x86_64`_ -* `Install Salt on Fedora 38 aarch64 and arm64`_ -* `Install Salt on Fedora 37 x86_64`_ -* `Install Salt on Fedora 37 aarch64 and arm64`_ +* `Install Salt on Fedora 39 x86_64`_ +* `Install Salt on Fedora 39 aarch64 and arm64`_ .. include:: ../_includes/what-is-onedir.rst .. include:: ../_includes/intro-install-by-os.rst -Install Salt on Fedora 38 x86_64 +Install Salt on Fedora 39 x86_64 ================================ -To install Salt on Fedora 38 for x86_64 architecture: +To install Salt on Fedora 39 for x86_64 architecture: #. Run the following commands to install the Salt Project repository and key: @@ -26,42 +24,42 @@ To install Salt on Fedora 38 for x86_64 architecture: .. tab-set:: - .. tab-item:: Fedora 38 (Latest onedir) + .. tab-item:: Fedora 39 (Latest onedir) To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Fedora 38**: + of Salt for **Fedora 39**: .. parsed-literal:: - sudo rpm --import \ |fedora38-latest-gpg-x86_64|\ + sudo rpm --import \ |fedora39-latest-gpg-x86_64|\ - curl -fsSL \ |fedora38-latest-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo + curl -fsSL \ |fedora39-latest-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Fedora 38 (Major onedir) + .. tab-item:: Fedora 39 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package - of Salt for **Fedora 38**: + of Salt for **Fedora 39**: .. parsed-literal:: - sudo rpm --import \ |fedora38-major-gpg-x86_64|\ + sudo rpm --import \ |fedora39-major-gpg-x86_64|\ - curl -fsSL \ |fedora38-major-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo + curl -fsSL \ |fedora39-major-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Fedora 38 (Minor onedir) + .. tab-item:: Fedora 39 (Minor onedir) To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package - of Salt for **Fedora 38**: + of Salt for **Fedora 39**: .. parsed-literal:: - sudo rpm --import \ |fedora38-minor-gpg-x86_64|\ + sudo rpm --import \ |fedora39-minor-gpg-x86_64|\ - curl -fsSL \ |fedora38-minor-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo + curl -fsSL \ |fedora39-minor-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo .. include:: ../_includes/gpg-keys.rst @@ -109,9 +107,9 @@ To install Salt on Fedora 38 for x86_64 architecture: .. include:: ../_includes/post-install-by-os.rst -Install Salt on Fedora 38 aarch64 and arm64 +Install Salt on Fedora 39 aarch64 and arm64 =========================================== -To install Salt on Fedora 38 for aarch64 and arm64 architectures: +To install Salt on Fedora 39 for aarch64 and arm64 architectures: #. Run the following commands to install the Salt Project repository and key: @@ -122,39 +120,39 @@ To install Salt on Fedora 38 for aarch64 and arm64 architectures: .. tab-item:: Fedora 38 (Latest onedir) To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Fedora 38**: + of Salt for **Fedora 39**: .. parsed-literal:: - sudo rpm --import \ |fedora38-latest-gpg-arm64|\ + sudo rpm --import \ |fedora39-latest-gpg-arm64|\ - curl -fsSL \ |fedora38-latest-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo + curl -fsSL \ |fedora39-latest-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Fedora 38 (Major onedir) + .. tab-item:: Fedora 39 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package - of Salt for **Fedora 38**: + of Salt for **Fedora 39**: .. parsed-literal:: - sudo rpm --import \ |fedora38-major-gpg-arm64|\ + sudo rpm --import \ |fedora39-major-gpg-arm64|\ - curl -fsSL \ |fedora38-major-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo + curl -fsSL \ |fedora39-major-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Fedora 38 (Minor onedir) + .. tab-item:: Fedora 39 (Minor onedir) To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package - of Salt for **Fedora 38**: + of Salt for **Fedora 39**: .. parsed-literal:: - sudo rpm --import \ |fedora38-minor-gpg-arm64|\ + sudo rpm --import \ |fedora39-minor-gpg-arm64|\ - curl -fsSL \ |fedora38-minor-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo + curl -fsSL \ |fedora39-minor-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo .. include:: ../_includes/gpg-keys.rst @@ -200,171 +198,3 @@ To install Salt on Fedora 38 for aarch64 and arm64 architectures: .. include:: ../_includes/install-dependencies-onedir.rst .. include:: ../_includes/post-install-by-os.rst - - -Install Salt on Fedora 37 x86_64 -================================ -To install the :ref:`onedir` packages of Salt on Fedora 37 for x86_64 -architecture: - -#. Run the following commands to install the Salt Project repository and key: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: Fedora 37 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Fedora 37**: - - .. parsed-literal:: - - sudo rpm --import \ |fedora37-latest-gpg-x86_64|\ - - curl -fsSL \ |fedora37-latest-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: Fedora 37 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package - of Salt for **Fedora 37**: - - .. parsed-literal:: - - sudo rpm --import \ |fedora37-major-gpg-x86_64|\ - - curl -fsSL \ |fedora37-major-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: Fedora 37 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package - of Salt for **Fedora 37**: - - .. parsed-literal:: - - sudo rpm --import \ |fedora37-minor-gpg-x86_64|\ - - curl -fsSL \ |fedora37-minor-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - -#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. - -#. Install the salt-minion, salt-master, or other Salt components: - - .. code-block:: bash - - sudo yum install salt-master - sudo yum install salt-minion - sudo yum install salt-ssh - sudo yum install salt-syndic - sudo yum install salt-cloud - sudo yum install salt-api - -#. Enable and start the services for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst - - -Install Salt on Fedora 37 aarch64 and arm64 -=========================================== -To install the :ref:`onedir` packages of Salt on Fedora 37 for aarch64 and -arm64 architectures: - -#. Run the following commands to install the Salt Project repository and key: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: Fedora 37 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Fedora 37**: - - .. parsed-literal:: - - sudo rpm --import \ |fedora37-latest-gpg-arm64|\ - - curl -fsSL \ |fedora37-latest-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: Fedora 37 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package - of Salt for **Fedora 37**: - - .. parsed-literal:: - - sudo rpm --import \ |fedora37-major-gpg-arm64|\ - - curl -fsSL \ |fedora37-major-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: Fedora 37 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package - of Salt for **Fedora 37**: - - .. parsed-literal:: - - sudo rpm --import \ |fedora37-minor-gpg-arm64|\ - - curl -fsSL \ |fedora37-minor-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - -#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. - -#. Install the salt-minion, salt-master, or other Salt components: - - .. code-block:: bash - - sudo yum install salt-master - sudo yum install salt-minion - sudo yum install salt-ssh - sudo yum install salt-syndic - sudo yum install salt-cloud - sudo yum install salt-api - -#. Enable and start the services for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst - - -Browse the repo -=============== - -.. card:: Browse the repo for Fedora packages - :class-card: sd-border-1 - :link: https://repo.saltproject.io/salt/py3/fedora/ - :width: 50% - - :bdg-primary:`Fedora` - |supported-release-1-badge| diff --git a/docs/topics/install-by-operating-system/photonos.rst b/docs/topics/install-by-operating-system/photonos.rst index 76e0531..1ec7872 100644 --- a/docs/topics/install-by-operating-system/photonos.rst +++ b/docs/topics/install-by-operating-system/photonos.rst @@ -8,7 +8,6 @@ These instructions explain how to install Salt on Photon OS operating systems. * `Install Salt on Photon OS 5`_ * `Install Salt on Photon OS 4`_ -* `Install Salt on Photon OS 3`_ .. include:: ../_includes/intro-install-by-os.rst @@ -241,121 +240,6 @@ To install Salt on Photon OS 4: .. include:: ../_includes/post-install-by-os.rst - -Install Salt on Photon OS 3 -=========================== -To install Salt on Photon OS 3: - -#. Run the following commands to install the Salt Project repository and key: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: Photon OS 3 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Photon OS 3**: - - .. parsed-literal:: - - sudo rpm --import \ |photonos3-latest-gpg|\ - - curl -fsSL \ |photonos3-latest-download|\ | sudo tee /etc/yum.repos.d/salt.repo - - tdnf clean all - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: Photon OS 3 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package - of Salt for **Photon OS 3**: - - .. parsed-literal:: - - sudo rpm --import \ |photonos3-major-gpg|\ - - curl -fsSL \ |photonos3-major-download|\ | sudo tee /etc/yum.repos.d/salt.repo - - tdnf clean all - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: Photon OS 3 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package - of Salt for **Photon OS 3**: - - .. parsed-literal:: - - sudo rpm --import \ |photonos3-minor-gpg|\ - - curl -fsSL \ |photonos3-minor-download|\ | sudo tee /etc/yum.repos.d/salt.repo - - tdnf clean all - - .. include:: ../_includes/gpg-keys.rst - -#. Install packages from the Photon OS repository, such as the salt-minion, - salt-master, or other Salt components: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: Photon OS 3 (Latest) - - To install the latest release of Salt packages that are available in - the Photon OS repository, run these commands: - - .. code-block:: bash - - sudo tdnf install salt-master - sudo tdnf install salt-minion - sudo tdnf install salt-ssh - sudo tdnf install salt-syndic - sudo tdnf install salt-cloud - sudo tdnf install salt-api - - - .. tab-item:: Photon OS 3 (Specific releases) - - The following is an example of how to install a specific release of - Salt based on the list of packages available in the Photon OS - repository: - - .. code-block:: bash - - sudo tdnf install salt3-master-3005-1.ph3 - sudo tdnf install salt3-minion-3005-1.ph3 - sudo tdnf install salt3-ssh-3005-1.ph3 - sudo tdnf install salt3-syndic-3005-1.ph3 - sudo tdnf install salt3-cloud-3005-1.ph3 - sudo tdnf install salt3-api-3005-1.ph3 - - .. Note:: - The file extensions are based on which version of Photon OS you - are installing Salt services on. For example, the extension for - Photon OS 3 is ``.ph3`` and the extension for Photon OS 4 is - ``.ph4``. - - -#. Enable and start the services for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst - - Browse the repo =============== diff --git a/docs/topics/salt-supported-operating-systems.rst b/docs/topics/salt-supported-operating-systems.rst index f4d420e..68729af 100644 --- a/docs/topics/salt-supported-operating-systems.rst +++ b/docs/topics/salt-supported-operating-systems.rst @@ -85,13 +85,6 @@ Overview of supported operating systems - Full - - * - `Debian`_ 10 - - amd64, arm64 - - Yes - - Yes - - Full - - Yes - * - `Debian`_ 11 - amd64, arm64 - Yes @@ -106,14 +99,7 @@ Overview of supported operating systems - Full - Yes - * - `Fedora`_ 37 - - x86_64, aarch64 / arm64 - - Yes - - Yes - - Full - - Yes - - * - `Fedora`_ 38 + * - `Fedora`_ 39 - x86_64, aarch64 / arm64 - Yes - Yes @@ -169,13 +155,6 @@ Overview of supported operating systems - Full - [#f1]_ - * - `Photon OS`_ 3 - - x86_64, aarch64 / arm64 - - Yes - - Yes - - Full - - - * - `Photon OS`_ 4 - x86_64, aarch64 / arm64 - Yes @@ -399,7 +378,7 @@ https://wiki.debian.org/DebianReleases Fedora ------ -Fedora version support mirrors that of the upstream maintainer. +Support is for the latest version of Fedora. RedHat @@ -424,7 +403,7 @@ https://www.oracle.com/technetwork/server-storage/linux/overview/index.html Photon OS --------- -Photon OS 3.0, 4.0, and 5.0. +Photon OS 4.0 and 5.0. SLES @@ -440,7 +419,7 @@ Ubuntu Ubuntu LTS versions through end-of-life. Ubuntu optional Extended Security Maintenance (ESM) is not supported. -http://www.ubuntu.com/info/release-end-of-life +https://ubuntu.com/about/release-cycle Windows From 34a71951b74d078dc45b70c7be78d6a8853a2f62 Mon Sep 17 00:00:00 2001 From: Derek <4846166-ScriptAutomate@users.noreply.gitlab.com> Date: Mon, 13 May 2024 17:55:24 +0000 Subject: [PATCH 11/17] Remove latest tabs from 3006 LTS to avoid STS installs/upgrades --- .../install-by-operating-system/amazon.rst | 52 ------------- .../install-by-operating-system/centos.rst | 72 ----------------- .../install-by-operating-system/debian.rst | 60 -------------- .../install-by-operating-system/fedora.rst | 26 ------- .../install-by-operating-system/photonos.rst | 30 ------- .../install-by-operating-system/rhel.rst | 78 ------------------- .../install-by-operating-system/ubuntu.rst | 56 ------------- 7 files changed, 374 deletions(-) diff --git a/docs/topics/install-by-operating-system/amazon.rst b/docs/topics/install-by-operating-system/amazon.rst index 7278edd..33ffa84 100644 --- a/docs/topics/install-by-operating-system/amazon.rst +++ b/docs/topics/install-by-operating-system/amazon.rst @@ -26,19 +26,6 @@ architecture: .. tab-set:: - .. tab-item:: Amazon Linux 2 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Amazon Linux 2**: - - .. parsed-literal:: - - sudo rpm --import \ |amazon-linux2-latest-gpg-x86_64|\ - - curl -fsSL \ |amazon-linux2-latest-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt-amzn.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Amazon Linux 2 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -104,19 +91,6 @@ arm64 architectures: .. tab-set:: - .. tab-item:: Amazon Linux 2 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Amazon Linux 2**: - - .. parsed-literal:: - - sudo rpm --import \ |amazon-linux2-latest-gpg-arm64|\ - - curl -fsSL \ |amazon-linux2-latest-download-arm64|\ | sudo tee /etc/yum.repos.d/salt-amzn.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Amazon Linux 2 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -182,19 +156,6 @@ architecture: .. tab-set:: - .. tab-item:: Amazon Linux 2023 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Amazon Linux 2023**: - - .. parsed-literal:: - - sudo rpm --import \ |amazon-linux2023-latest-gpg-x86_64|\ - - curl -fsSL \ |amazon-linux2023-latest-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt-amzn.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Amazon Linux 2023 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -260,19 +221,6 @@ arm64 architectures: .. tab-set:: - .. tab-item:: Amazon Linux 2023 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Amazon Linux 2023**: - - .. parsed-literal:: - - sudo rpm --import \ |amazon-linux2023-latest-gpg-arm64|\ - - curl -fsSL \ |amazon-linux2023-latest-download-arm64|\ | sudo tee /etc/yum.repos.d/salt-amzn.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Amazon Linux 2023 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package diff --git a/docs/topics/install-by-operating-system/centos.rst b/docs/topics/install-by-operating-system/centos.rst index 053f69e..964d268 100644 --- a/docs/topics/install-by-operating-system/centos.rst +++ b/docs/topics/install-by-operating-system/centos.rst @@ -30,18 +30,6 @@ architecture: .. tab-set:: - .. tab-item:: CentOS 9 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package of Salt for **CentOS 9**: - - .. parsed-literal:: - - sudo rpm --import \ |centos9-latest-gpg-x86_64|\ - - curl -fsSL \ |centos9-latest-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: CentOS 9 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **CentOS 9**: @@ -105,18 +93,6 @@ arm64 architectures: .. tab-set:: - .. tab-item:: CentOS 9 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package of Salt for **CentOS 9**: - - .. parsed-literal:: - - sudo rpm --import \ |centos9-latest-gpg-arm64|\ - - curl -fsSL \ |centos9-latest-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: CentOS 9 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **CentOS 9**: @@ -181,18 +157,6 @@ architecture: .. tab-set:: - .. tab-item:: CentOS 8 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package of Salt for **CentOS 8**: - - .. parsed-literal:: - - sudo rpm --import \ |centos8-latest-gpg-x86_64|\ - - curl -fsSL \ |centos8-latest-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: CentOS 8 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **CentOS 8**: @@ -257,18 +221,6 @@ arm64 architectures: .. tab-set:: - .. tab-item:: CentOS 8 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package of Salt for **CentOS 8**: - - .. parsed-literal:: - - sudo rpm --import \ |centos8-latest-gpg-arm64|\ - - curl -fsSL \ |centos8-latest-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: CentOS 8 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **CentOS 8**: @@ -332,18 +284,6 @@ To install Salt on CentOS 7 for x86_64 architecture: .. tab-set:: - .. tab-item:: CentOS 7 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package of Salt for **CentOS 7**: - - .. parsed-literal:: - - sudo rpm --import \ |centos7-latest-gpg-x86_64|\ - - curl -fsSL \ |centos7-latest-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: CentOS 7 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **CentOS 7**: @@ -407,18 +347,6 @@ To install Salt on CentOS 7 for aarch64 and arm64 architectures: .. tab-set:: - .. tab-item:: CentOS 7 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package of Salt for **CentOS 7**: - - .. parsed-literal:: - - sudo rpm --import \ |centos7-latest-gpg-arm64|\ - - curl -fsSL \ |centos7-latest-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: CentOS 7 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **CentOS 7**: diff --git a/docs/topics/install-by-operating-system/debian.rst b/docs/topics/install-by-operating-system/debian.rst index 9d1f458..052fc9e 100644 --- a/docs/topics/install-by-operating-system/debian.rst +++ b/docs/topics/install-by-operating-system/debian.rst @@ -28,21 +28,6 @@ amd64 architecture: .. tab-set:: - .. tab-item:: Debian 12 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Debian 12 (Bookworm)**: - - .. parsed-literal:: - - mkdir /etc/apt/keyrings - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg |debian12-latest-gpg-amd64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |debian12-latest-download-amd64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Debian 12 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -113,21 +98,6 @@ arm64 architecture: .. tab-set:: - .. tab-item:: Debian 12 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Debian 12 (Bookworm)**: - - .. parsed-literal:: - - mkdir /etc/apt/keyrings - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg |debian12-latest-gpg-arm64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=arm64] \ |debian12-latest-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Debian 12 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -198,21 +168,6 @@ amd64 architecture: .. tab-set:: - .. tab-item:: Debian 11 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Debian 11 (Bullseye)**: - - .. parsed-literal:: - - mkdir /etc/apt/keyrings - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg |debian11-latest-gpg-amd64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |debian11-latest-download-amd64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Debian 11 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -283,21 +238,6 @@ arm64 architecture: .. tab-set:: - .. tab-item:: Debian 11 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Debian 11 (Bullseye)**: - - .. parsed-literal:: - - mkdir /etc/apt/keyrings - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg |debian11-latest-gpg-arm64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |debian11-latest-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Debian 11 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package diff --git a/docs/topics/install-by-operating-system/fedora.rst b/docs/topics/install-by-operating-system/fedora.rst index f4b726b..cd3be71 100644 --- a/docs/topics/install-by-operating-system/fedora.rst +++ b/docs/topics/install-by-operating-system/fedora.rst @@ -24,19 +24,6 @@ To install Salt on Fedora 39 for x86_64 architecture: .. tab-set:: - .. tab-item:: Fedora 39 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Fedora 39**: - - .. parsed-literal:: - - sudo rpm --import \ |fedora39-latest-gpg-x86_64|\ - - curl -fsSL \ |fedora39-latest-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Fedora 39 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -117,19 +104,6 @@ To install Salt on Fedora 39 for aarch64 and arm64 architectures: .. tab-set:: - .. tab-item:: Fedora 38 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Fedora 39**: - - .. parsed-literal:: - - sudo rpm --import \ |fedora39-latest-gpg-arm64|\ - - curl -fsSL \ |fedora39-latest-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Fedora 39 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package diff --git a/docs/topics/install-by-operating-system/photonos.rst b/docs/topics/install-by-operating-system/photonos.rst index 1ec7872..80e5c1d 100644 --- a/docs/topics/install-by-operating-system/photonos.rst +++ b/docs/topics/install-by-operating-system/photonos.rst @@ -21,21 +21,6 @@ To install Salt on Photon OS 5: .. tab-set:: - .. tab-item:: Photon OS 5 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Photon OS 5**: - - .. parsed-literal:: - - sudo rpm --import \ |photonos5-latest-gpg|\ - - curl -fsSL \ |photonos5-latest-download|\ | sudo tee /etc/yum.repos.d/salt.repo - - tdnf clean all - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Photon OS 5 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -136,21 +121,6 @@ To install Salt on Photon OS 4: .. tab-set:: - .. tab-item:: Photon OS 4 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Photon OS 4**: - - .. parsed-literal:: - - sudo rpm --import \ |photonos4-latest-gpg|\ - - curl -fsSL \ |photonos4-latest-download|\ | sudo tee /etc/yum.repos.d/salt.repo - - tdnf clean all - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Photon OS 4 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package diff --git a/docs/topics/install-by-operating-system/rhel.rst b/docs/topics/install-by-operating-system/rhel.rst index 0afcb77..1009008 100644 --- a/docs/topics/install-by-operating-system/rhel.rst +++ b/docs/topics/install-by-operating-system/rhel.rst @@ -29,19 +29,6 @@ To install Salt on RedHat 9 for x86_64 architecture: .. tab-set:: - .. tab-item:: RHEL 9 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **RHEL 9**: - - .. parsed-literal:: - - sudo rpm --import \ |rhel9-latest-gpg-x86_64|\ - - curl -fsSL \ |rhel9-latest-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: RHEL 9 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -122,19 +109,6 @@ To install Salt on RedHat 9 for aarch64 and arm64 architectures: .. tab-set:: - .. tab-item:: RHEL 9 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **RHEL 9**: - - .. parsed-literal:: - - sudo rpm --import \ |rhel9-latest-gpg-arm64|\ - - curl -fsSL \ |rhel9-latest-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: RHEL 9 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -216,19 +190,6 @@ architecture: .. tab-set:: - .. tab-item:: RHEL 8 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **RHEL 8**: - - .. parsed-literal:: - - sudo rpm --import \ |rhel8-latest-gpg-x86_64|\ - - curl -fsSL \ |rhel8-latest-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: RHEL 8 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -294,19 +255,6 @@ arm64 architectures: .. tab-set:: - .. tab-item:: RHEL 8 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **RHEL 8**: - - .. parsed-literal:: - - sudo rpm --import \ |rhel8-latest-gpg-arm64|\ - - curl -fsSL \ |rhel8-latest-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: RHEL 8 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -372,19 +320,6 @@ architecture: .. tab-set:: - .. tab-item:: RHEL 7 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **RHEL 7**: - - .. parsed-literal:: - - sudo rpm --import \ |rhel7-latest-gpg-x86_64|\ - - curl -fsSL \ |rhel7-latest-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: RHEL 7 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -451,19 +386,6 @@ arm64 architectures: .. tab-set:: - .. tab-item:: RHEL 7 (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **RHEL 7**: - - .. parsed-literal:: - - sudo rpm --import \ |rhel7-latest-gpg-arm64|\ - - curl -fsSL \ |rhel7-latest-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: RHEL 7 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package diff --git a/docs/topics/install-by-operating-system/ubuntu.rst b/docs/topics/install-by-operating-system/ubuntu.rst index 94b25bc..e3558d0 100644 --- a/docs/topics/install-by-operating-system/ubuntu.rst +++ b/docs/topics/install-by-operating-system/ubuntu.rst @@ -28,19 +28,6 @@ amd64 architecture: .. tab-set:: - .. tab-item:: Ubuntu 22.04 (Jammy) (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Ubuntu 22.04 (Jammy)**: - - .. parsed-literal:: - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu22-latest-gpg-amd64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |ubuntu22-latest-download-amd64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Ubuntu 22.04 (Jammy) (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -108,19 +95,6 @@ arm64 architecture: .. tab-set:: - .. tab-item:: Ubuntu 22.04 (Jammy) (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Ubuntu 22.04 (Jammy)**: - - .. parsed-literal:: - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu22-latest-gpg-arm64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=arm64] \ |ubuntu22-latest-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Ubuntu 22.04 (Jammy) (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -189,21 +163,6 @@ amd64 architecture: .. tab-set:: - .. tab-item:: Ubuntu 20.04 (Focal) (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Ubuntu 20.04 (Focal)**: - - .. parsed-literal:: - - mkdir /etc/apt/keyrings - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu20-latest-gpg-amd64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |ubuntu20-latest-download-amd64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Ubuntu 20.04 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package @@ -274,21 +233,6 @@ arm64 architecture: .. tab-set:: - .. tab-item:: Ubuntu 20.04 (Focal) (Latest onedir) - - To pin your Salt upgrades to the :ref:`latest` :ref:`onedir` package - of Salt for **Ubuntu 20.04 (Focal)**: - - .. parsed-literal:: - - mkdir /etc/apt/keyrings - - sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu20-latest-gpg-arm64|\ - - echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=arm64] \ |ubuntu20-latest-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list - - .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Ubuntu 20.04 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package From 8e1acef654f1cb6cf99b6b7f48cab222bc0e599b Mon Sep 17 00:00:00 2001 From: Alyssa Rock Date: Wed, 22 May 2024 18:08:27 +0000 Subject: [PATCH 12/17] Prep for 3007.1 on v3006.0 branch --- docs/topics/announcements.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/announcements.rst b/docs/topics/announcements.rst index aa0962a..faeb170 100644 --- a/docs/topics/announcements.rst +++ b/docs/topics/announcements.rst @@ -29,6 +29,7 @@ for the latest announcements. Release announcements ===================== +* **May 22, 2024:** `3007.1 `_ is now available. * **April 30, 2024:** `3006.8 `_ is now available. * **March 6, 2024:** `3007.0 `_ is now available. * **February 21, 2024:** `3006.7 `_ is now available. From e97ecb27fb27a66ac033f019da5103f53ace5f86 Mon Sep 17 00:00:00 2001 From: Derek <4846166-ScriptAutomate@users.noreply.gitlab.com> Date: Wed, 26 Jun 2024 22:42:35 +0000 Subject: [PATCH 13/17] [v3006] Download Announcements page from GitLab snippets --- .gitignore | 1 + README.rst | 6 ++--- docs/topics/announcements.rst | 48 ----------------------------------- tools/version-updater.py | 8 ++++++ 4 files changed, 12 insertions(+), 51 deletions(-) delete mode 100644 docs/topics/announcements.rst diff --git a/.gitignore b/.gitignore index 2ec736c..dcc305a 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,7 @@ instance/ docs/_build/ ## Generated stuff from Sphinx templates docs/sitevars.rst +docs/topics/announcements.rst # PyBuilder .pybuilder/ diff --git a/README.rst b/README.rst index d90155f..ce97b5b 100644 --- a/README.rst +++ b/README.rst @@ -2,9 +2,9 @@ Salt install guide ================== -.. image:: https://img.shields.io/badge/slack-Salt%20Project-blue.svg?logo=slack - :alt: Salt Project Slack Community - :target: https://via.vmw.com/salt-slack +.. image:: https://img.shields.io/badge/slack-Salt%20Project-blue.svg?logo=discord + :alt: Salt Project Discord Community + :target: https://discord.gg/YVQamSwV3g .. image:: https://img.shields.io/pypi/dm/salt?label=pypi%20downloads :alt: PyPi Package Downloads diff --git a/docs/topics/announcements.rst b/docs/topics/announcements.rst deleted file mode 100644 index faeb170..0000000 --- a/docs/topics/announcements.rst +++ /dev/null @@ -1,48 +0,0 @@ -.. _announcements: - -============= -Announcements -============= - -.. |date| date:: - -.. article-info:: - :avatar: ../_static/img/SaltProject_Logomark_teal.png - :avatar-link: https://saltproject.io/ - :avatar-outline: muted - :date: Last updated on |date| - :author: **The Salt Project** - :class-container: sd-p-2 sd-outline-muted sd-rounded-1 - - -Security announcements -====================== - -See `Security announcements `_ -for the latest announcements. - -.. Important:: - To be notified of the latest security updates, subscribe to the - `Salt security announcements RSS feed `_. - - -Release announcements -===================== - -* **May 22, 2024:** `3007.1 `_ is now available. -* **April 30, 2024:** `3006.8 `_ is now available. -* **March 6, 2024:** `3007.0 `_ is now available. -* **February 21, 2024:** `3006.7 `_ is now available. -* **January 31, 2024:** `3006.6 `_ is now available. -* **January 31, 2024:** `3005.5 `_ is now available. -* **December 12, 2023:** `3006.5 `_ is now available. -* **October 27, 2023:** `3006.4 `_ is now available. -* **October 27, 2023:** `3005.4 `_ is now available. -* **September 21, 2023:** `3005.3 `_ is now available. -* **September 7, 2023:** `3006.3 `_ is now available. -* **August 10, 2023:** `3006.2 `_ is now available. -* **August 10, 2023:** `3005.2 `_ is now available. -* **May 5, 2023:** `3006.1 `_ is now available. -* **April 18, 2023:** `3006.0 `_ is now available. -* **October 4, 2022:** `3005.1 `_ is now available. -* **August 25, 2022:** `3005 `_ is now available. diff --git a/tools/version-updater.py b/tools/version-updater.py index d6f18c8..dace931 100644 --- a/tools/version-updater.py +++ b/tools/version-updater.py @@ -78,3 +78,11 @@ # Write dynamic sitevars file with open(sitevars_updated_file, "w") as sitevars_updated_file_writer: sitevars_updated_file_writer.write(sitevars_updated) + +# Write latest announcements file +latest_announcements = requests.get( + "https://gitlab.com/saltstack/open/docs/salt-install-guide/-/snippets/3722105/raw/main/announcements.rst" +) +announcements_file = Path("docs", "topics", "announcements.rst") +with open(announcements_file, "w") as announcements_updated_file_writer: + announcements_updated_file_writer.write(latest_announcements.text) From 32436f842321f71b41fe7db1d83311f0dfb7720d Mon Sep 17 00:00:00 2001 From: Derek <4846166-ScriptAutomate@users.noreply.gitlab.com> Date: Tue, 30 Jul 2024 19:57:46 +0000 Subject: [PATCH 14/17] [3006.x] Updating with latest supported OS pages --- docs/_templates/sitevars.rst | 106 ++--- docs/topics/downloads.rst | 21 + .../install-by-operating-system/centos.rst | 408 +----------------- .../install-by-operating-system/fedora.rst | 44 +- .../install-by-operating-system/rhel.rst | 138 +----- .../install-by-operating-system/rocky.rst | 285 ++++++++++++ .../install-by-operating-system/ubuntu.rst | 136 ++++++ .../salt-supported-operating-systems.rst | 85 ++-- docs/topics/upgrade.rst | 2 +- 9 files changed, 556 insertions(+), 669 deletions(-) create mode 100644 docs/topics/install-by-operating-system/rocky.rst diff --git a/docs/_templates/sitevars.rst b/docs/_templates/sitevars.rst index 89a78a5..3184e06 100644 --- a/docs/_templates/sitevars.rst +++ b/docs/_templates/sitevars.rst @@ -49,47 +49,33 @@ .. |amazon-linux2023-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/amazon/2023/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub .. |amazon-linux2023-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/amazon/2023/arm64/minor/CURRENT_MINOR.repo -.. |centos9-latest-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos9-latest-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/latest.repo -.. |centos9-major-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos9-major-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/CURRENT_MAJOR.repo -.. |centos9-minor-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos9-minor-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/minor/CURRENT_MINOR.repo - -.. |centos9-latest-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos9-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/arm64/latest.repo -.. |centos9-major-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos9-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/arm64/CURRENT_MAJOR.repo -.. |centos9-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos9-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/arm64/minor/CURRENT_MINOR.repo - -.. |centos8-latest-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos8-latest-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/x86_64/latest.repo -.. |centos8-major-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos8-major-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/x86_64/CURRENT_MAJOR.repo -.. |centos8-minor-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos8-minor-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/x86_64/minor/CURRENT_MINOR.repo - -.. |centos8-latest-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos8-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/arm64/latest.repo -.. |centos8-major-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos8-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/arm64/CURRENT_MAJOR.repo -.. |centos8-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos8-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/arm64/minor/CURRENT_MINOR.repo - -.. |centos7-latest-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos7-latest-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/x86_64/latest.repo -.. |centos7-major-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos7-major-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/x86_64/CURRENT_MAJOR.repo -.. |centos7-minor-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos7-minor-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/x86_64/minor/CURRENT_MINOR.repo - -.. |centos7-latest-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos7-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/arm64/latest.repo -.. |centos7-major-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos7-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/arm64/CURRENT_MAJOR.repo -.. |centos7-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |centos7-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/arm64/minor/CURRENT_MINOR.repo +.. |rocky9-latest-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |rocky9-latest-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/latest.repo +.. |rocky9-major-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |rocky9-major-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/CURRENT_MAJOR.repo +.. |rocky9-minor-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |rocky9-minor-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/x86_64/minor/CURRENT_MINOR.repo + +.. |rocky9-latest-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |rocky9-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/arm64/latest.repo +.. |rocky9-major-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |rocky9-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/arm64/CURRENT_MAJOR.repo +.. |rocky9-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |rocky9-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/9/arm64/minor/CURRENT_MINOR.repo + +.. |rocky8-latest-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |rocky8-latest-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/x86_64/latest.repo +.. |rocky8-major-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |rocky8-major-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/x86_64/CURRENT_MAJOR.repo +.. |rocky8-minor-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |rocky8-minor-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/x86_64/minor/CURRENT_MINOR.repo + +.. |rocky8-latest-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |rocky8-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/arm64/latest.repo +.. |rocky8-major-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |rocky8-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/arm64/CURRENT_MAJOR.repo +.. |rocky8-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |rocky8-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/8/arm64/minor/CURRENT_MINOR.repo .. |debian12-latest-gpg-amd64| replace:: https://repo.saltproject.io/salt/py3/debian/12/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg .. |debian12-latest-download-amd64| replace:: https://repo.saltproject.io/salt/py3/debian/12/amd64/latest bookworm main @@ -133,19 +119,19 @@ .. |debian10-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/debian/10/arm64/SALT-PROJECT-GPG-PUBKEY-2023.gpg .. |debian10-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/debian/10/arm64/minor/CURRENT_MINOR buster main -.. |fedora39-latest-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora39-latest-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/x86_64/latest.repo -.. |fedora39-major-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora39-major-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/x86_64/CURRENT_MAJOR.repo -.. |fedora39-minor-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora39-minor-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/x86_64/minor/CURRENT_MINOR.repo +.. |fedora40-latest-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/40/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |fedora40-latest-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/40/x86_64/latest.repo +.. |fedora40-major-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/40/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |fedora40-major-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/40/x86_64/CURRENT_MAJOR.repo +.. |fedora40-minor-gpg-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/40/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |fedora40-minor-download-x86_64| replace:: https://repo.saltproject.io/salt/py3/fedora/40/x86_64/minor/CURRENT_MINOR.repo -.. |fedora39-latest-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora39-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/arm64/latest.repo -.. |fedora39-major-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora39-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/arm64/CURRENT_MAJOR.repo -.. |fedora39-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub -.. |fedora39-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/39/arm64/minor/CURRENT_MINOR.repo +.. |fedora40-latest-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/40/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |fedora40-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/40/arm64/latest.repo +.. |fedora40-major-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/40/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |fedora40-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/40/arm64/CURRENT_MAJOR.repo +.. |fedora40-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/40/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub +.. |fedora40-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/fedora/40/arm64/minor/CURRENT_MINOR.repo .. |macos-amd64-download| replace:: https://repo.saltproject.io/salt/py3/macos/CURRENT_MAJOR/salt-CURRENT_MINOR-py3-x86_64.pkg .. |macos-amd64-gpg| replace:: https://repo.saltproject.io/salt/py3/macos/SALT-PROJECT-GPG-PUBKEY-2023.gpg @@ -207,6 +193,20 @@ .. |rhel7-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/arm64/SALT-PROJECT-GPG-PUBKEY-2023.pub .. |rhel7-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/arm64/minor/CURRENT_MINOR.repo +.. |ubuntu24-latest-gpg-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg +.. |ubuntu24-latest-download-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/latest jammy main +.. |ubuntu24-major-gpg-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg +.. |ubuntu24-major-download-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/CURRENT_MAJOR jammy main +.. |ubuntu24-minor-gpg-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg +.. |ubuntu24-minor-download-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/minor/CURRENT_MINOR jammy main + +.. |ubuntu24-latest-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/SALT-PROJECT-GPG-PUBKEY-2023.gpg +.. |ubuntu24-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/latest jammy main +.. |ubuntu24-major-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/SALT-PROJECT-GPG-PUBKEY-2023.gpg +.. |ubuntu24-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/CURRENT_MAJOR jammy main +.. |ubuntu24-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/SALT-PROJECT-GPG-PUBKEY-2023.gpg +.. |ubuntu24-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/minor/CURRENT_MINOR jammy main + .. |ubuntu22-latest-gpg-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg .. |ubuntu22-latest-download-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/latest jammy main .. |ubuntu22-major-gpg-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg diff --git a/docs/topics/downloads.rst b/docs/topics/downloads.rst index 2c12727..60abbf4 100644 --- a/docs/topics/downloads.rst +++ b/docs/topics/downloads.rst @@ -180,6 +180,27 @@ Install the RedHat package using a yum package manager. :bdg-info:`Install Salt on RedHat` +Rocky Linux +=========== +Install the Rocky Linux package using a yum package manager. + +.. grid:: 2 + + .. grid-item-card:: Browse the repo for Rocky Linux packages + :class-card: sd-border-1 + :link: https://repo.saltproject.io/salt/py3/redhat/ + + :bdg-danger:`Rocky Linux` + |supported-release-1-badge| + + .. grid-item-card:: Rocky Linux install guide + :class-card: sd-border-1 + :link: install-rocky + :link-type: ref + + :bdg-info:`Install Salt on Rocky Linux` + + SUSE (SLES) =========== Install the SUSE (SLES) package from the SUSE package repository. SUSE creates diff --git a/docs/topics/install-by-operating-system/centos.rst b/docs/topics/install-by-operating-system/centos.rst index 964d268..e14c31b 100644 --- a/docs/topics/install-by-operating-system/centos.rst +++ b/docs/topics/install-by-operating-system/centos.rst @@ -4,409 +4,5 @@ CentOS ====== -These instructions explain how to install Salt on CentOS operating systems: - -* `Install Salt on CentOS Stream 9 x86_64`_ -* `Install Salt on CentOS Stream 9 aarch64 and arm64`_ -* `Install Salt on CentOS Stream 8 x86_64`_ -* `Install Salt on CentOS Stream 8 aarch64 and arm64`_ -* `Install Salt on CentOS 7 x86_64`_ -* `Install Salt on CentOS 7 aarch64 and arm64`_ - - -.. include:: ../_includes/what-is-onedir.rst - -.. include:: ../_includes/intro-install-by-os.rst - - -Install Salt on CentOS Stream 9 x86_64 -====================================== -To install the :ref:`onedir` packages of Salt on Centos 9 for x86_64 -architecture: - -#. Run the following commands to install the Salt Project repository and key: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: CentOS 9 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **CentOS 9**: - - .. parsed-literal:: - - sudo rpm --import \ |centos9-major-gpg-x86_64|\ - - curl -fsSL \ |centos9-major-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: CentOS 9 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package of Salt for **CentOS 9**: - - .. parsed-literal:: - - sudo rpm --import \ |centos9-minor-gpg-x86_64|\ - - curl -fsSL \ |centos9-minor-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - -#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. - -#. Install the salt-minion, salt-master, or other Salt components: - - .. code-block:: bash - - sudo yum install salt-master - sudo yum install salt-minion - sudo yum install salt-ssh - sudo yum install salt-syndic - sudo yum install salt-cloud - sudo yum install salt-api - -#. Enable and start the services for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst - - -Install Salt on CentOS Stream 9 aarch64 and arm64 -================================================= -To install the :ref:`onedir` packages of Salt on Centos 9 for aarch64 and -arm64 architectures: - -#. Run the following commands to install the Salt Project repository and key: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: CentOS 9 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **CentOS 9**: - - .. parsed-literal:: - - sudo rpm --import \ |centos9-major-gpg-arm64|\ - - curl -fsSL \ |centos9-major-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: CentOS 9 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package of Salt for **CentOS 9**: - - .. parsed-literal:: - - sudo rpm --import \ |centos9-minor-gpg-arm64|\ - - curl -fsSL \ |centos9-minor-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - -#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. - -#. Install the salt-minion, salt-master, or other Salt components: - - .. code-block:: bash - - sudo yum install salt-master - sudo yum install salt-minion - sudo yum install salt-ssh - sudo yum install salt-syndic - sudo yum install salt-cloud - sudo yum install salt-api - -#. Enable and start the services for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst - - - -Install Salt on CentOS Stream 8 x86_64 -====================================== -To install the :ref:`onedir` packages of Salt on Centos 8 for x86_64 -architecture: - -#. Run the following commands to install the Salt Project repository and key: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: CentOS 8 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **CentOS 8**: - - .. parsed-literal:: - - sudo rpm --import \ |centos8-major-gpg-x86_64|\ - - curl -fsSL \ |centos8-major-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: CentOS 8 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package of Salt for **CentOS 8**: - - .. parsed-literal:: - - sudo rpm --import \ |centos8-minor-gpg-x86_64|\ - - curl -fsSL \ |centos8-minor-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - -#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. - -#. Install the salt-minion, salt-master, or other Salt components: - - .. code-block:: bash - - sudo yum install salt-master - sudo yum install salt-minion - sudo yum install salt-ssh - sudo yum install salt-syndic - sudo yum install salt-cloud - sudo yum install salt-api - -#. Enable and start the services for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst - - - -Install Salt on CentOS Stream 8 aarch64 and arm64 -================================================= -To install the :ref:`onedir` packages of Salt on Centos 8 for aarch64 and -arm64 architectures: - -#. Run the following commands to install the Salt Project repository and key: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: CentOS 8 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **CentOS 8**: - - .. parsed-literal:: - - sudo rpm --import \ |centos8-major-gpg-arm64|\ - - curl -fsSL \ |centos8-major-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: CentOS 8 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package of Salt for **CentOS 8**: - - .. parsed-literal:: - - sudo rpm --import \ |centos8-minor-gpg-arm64|\ - - curl -fsSL \ |centos8-minor-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - -#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. - -#. Install the salt-minion, salt-master, or other Salt components: - - .. code-block:: bash - - sudo yum install salt-master - sudo yum install salt-minion - sudo yum install salt-ssh - sudo yum install salt-syndic - sudo yum install salt-cloud - sudo yum install salt-api - -#. Enable and start the services for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst - - - -Install Salt on CentOS 7 x86_64 -=============================== -To install Salt on CentOS 7 for x86_64 architecture: - -#. Run the following commands to install the Salt Project repository and key: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: CentOS 7 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **CentOS 7**: - - .. parsed-literal:: - - sudo rpm --import \ |centos7-major-gpg-x86_64|\ - - curl -fsSL \ |centos7-major-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: CentOS 7 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package of Salt for **CentOS 7**: - - .. parsed-literal:: - - sudo rpm --import \ |centos7-minor-gpg-x86_64|\ - - curl -fsSL \ |centos7-minor-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - -#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. - -#. Install the salt-minion, salt-master, or other Salt components: - - .. code-block:: bash - - sudo yum install salt-master - sudo yum install salt-minion - sudo yum install salt-ssh - sudo yum install salt-syndic - sudo yum install salt-cloud - sudo yum install salt-api - -#. Enable and start service for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - - -.. include:: ../_includes/post-install-by-os.rst - - -Install Salt on CentOS 7 aarch64 and arm64 -========================================== -To install Salt on CentOS 7 for aarch64 and arm64 architectures: - -#. Run the following commands to install the Salt Project repository and key: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: CentOS 7 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **CentOS 7**: - - .. parsed-literal:: - - sudo rpm --import \ |centos7-major-gpg-arm64|\ - - curl -fsSL \ |centos7-major-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: CentOS 7 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package of Salt for **CentOS 7**: - - .. parsed-literal:: - - sudo rpm --import \ |centos7-minor-gpg-arm64|\ - - curl -fsSL \ |centos7-minor-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - -#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. - -#. Install the salt-minion, salt-master, or other Salt components: - - .. code-block:: bash - - sudo yum install salt-master - sudo yum install salt-minion - sudo yum install salt-ssh - sudo yum install salt-syndic - sudo yum install salt-cloud - sudo yum install salt-api - -#. Enable and start service for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - - -.. include:: ../_includes/post-install-by-os.rst - - -Browse the repo -=============== - -.. card:: Browse the repo for CentOS packages - :class-card: sd-border-1 - :link: https://repo.saltproject.io/salt/py3/redhat/ - :width: 50% - - :bdg-primary:`CentOS` - |supported-release-1-badge| +For CentOS Stream 9, use the instructions for installing Salt on +:ref:`install-rocky`. diff --git a/docs/topics/install-by-operating-system/fedora.rst b/docs/topics/install-by-operating-system/fedora.rst index cd3be71..d27212c 100644 --- a/docs/topics/install-by-operating-system/fedora.rst +++ b/docs/topics/install-by-operating-system/fedora.rst @@ -6,17 +6,17 @@ Fedora These instructions explain how to install Salt on Fedora operating systems: -* `Install Salt on Fedora 39 x86_64`_ -* `Install Salt on Fedora 39 aarch64 and arm64`_ +* `Install Salt on Fedora 40 x86_64`_ +* `Install Salt on Fedora 40 aarch64 and arm64`_ .. include:: ../_includes/what-is-onedir.rst .. include:: ../_includes/intro-install-by-os.rst -Install Salt on Fedora 39 x86_64 +Install Salt on Fedora 40 x86_64 ================================ -To install Salt on Fedora 39 for x86_64 architecture: +To install Salt on Fedora 40 for x86_64 architecture: #. Run the following commands to install the Salt Project repository and key: @@ -24,29 +24,29 @@ To install Salt on Fedora 39 for x86_64 architecture: .. tab-set:: - .. tab-item:: Fedora 39 (Major onedir) + .. tab-item:: Fedora 40 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package - of Salt for **Fedora 39**: + of Salt for **Fedora 40**: .. parsed-literal:: - sudo rpm --import \ |fedora39-major-gpg-x86_64|\ + sudo rpm --import \ |fedora40-major-gpg-x86_64|\ - curl -fsSL \ |fedora39-major-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo + curl -fsSL \ |fedora40-major-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Fedora 39 (Minor onedir) + .. tab-item:: Fedora 40 (Minor onedir) To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package - of Salt for **Fedora 39**: + of Salt for **Fedora 40**: .. parsed-literal:: - sudo rpm --import \ |fedora39-minor-gpg-x86_64|\ + sudo rpm --import \ |fedora40-minor-gpg-x86_64|\ - curl -fsSL \ |fedora39-minor-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo + curl -fsSL \ |fedora40-minor-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo .. include:: ../_includes/gpg-keys.rst @@ -94,9 +94,9 @@ To install Salt on Fedora 39 for x86_64 architecture: .. include:: ../_includes/post-install-by-os.rst -Install Salt on Fedora 39 aarch64 and arm64 +Install Salt on Fedora 40 aarch64 and arm64 =========================================== -To install Salt on Fedora 39 for aarch64 and arm64 architectures: +To install Salt on Fedora 40 for aarch64 and arm64 architectures: #. Run the following commands to install the Salt Project repository and key: @@ -104,29 +104,29 @@ To install Salt on Fedora 39 for aarch64 and arm64 architectures: .. tab-set:: - .. tab-item:: Fedora 39 (Major onedir) + .. tab-item:: Fedora 40 (Major onedir) To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package - of Salt for **Fedora 39**: + of Salt for **Fedora 40**: .. parsed-literal:: - sudo rpm --import \ |fedora39-major-gpg-arm64|\ + sudo rpm --import \ |fedora40-major-gpg-arm64|\ - curl -fsSL \ |fedora39-major-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo + curl -fsSL \ |fedora40-major-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo .. include:: ../_includes/gpg-keys.rst - .. tab-item:: Fedora 39 (Minor onedir) + .. tab-item:: Fedora 40 (Minor onedir) To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package - of Salt for **Fedora 39**: + of Salt for **Fedora 40**: .. parsed-literal:: - sudo rpm --import \ |fedora39-minor-gpg-arm64|\ + sudo rpm --import \ |fedora40-minor-gpg-arm64|\ - curl -fsSL \ |fedora39-minor-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo + curl -fsSL \ |fedora40-minor-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo .. include:: ../_includes/gpg-keys.rst diff --git a/docs/topics/install-by-operating-system/rhel.rst b/docs/topics/install-by-operating-system/rhel.rst index 1009008..e51d2be 100644 --- a/docs/topics/install-by-operating-system/rhel.rst +++ b/docs/topics/install-by-operating-system/rhel.rst @@ -11,8 +11,6 @@ systems: * `Install Salt on RedHat (RHEL) 9 aarch64 and arm64`_ * `Install Salt on RedHat (RHEL) 8 x86_64`_ * `Install Salt on RedHat (RHEL) 8 aarch64 and arm64`_ -* `Install Salt on RedHat (RHEL) 7 x86_64`_ -* `Install Salt on RedHat (RHEL) 7 aarch64 and arm64`_ .. include:: ../_includes/what-is-onedir.rst @@ -68,7 +66,7 @@ To install Salt on RedHat 9 for x86_64 architecture: the least preferred. By default all repositories have the priority of 80. EPEL was treating the Salt repository as 99. To resolve this issue, Salt - has changed its priority level to 10 for RHEL 7, 8, and 9. + has changed its priority level to 10 for RHEL 8 and 9. #. Run ``sudo yum clean expire-cache`` to clear the repository metadata. @@ -148,7 +146,7 @@ To install Salt on RedHat 9 for aarch64 and arm64 architectures: the least preferred. By default all repositories have the priority of 80. EPEL was treating the Salt repository as 99. To resolve this issue, Salt - has changed its priority level to 10 for RHEL 7, 8, and 9. + has changed its priority level to 10 for RHEL 8 and 9. #. Run ``sudo yum clean expire-cache`` to clear the repository metadata. @@ -309,138 +307,6 @@ arm64 architectures: .. include:: ../_includes/post-install-by-os.rst -Install Salt on RedHat (RHEL) 7 x86_64 -====================================== -To install the :ref:`onedir` packages of Salt on RedHat 7 for x86_64 -architecture: - -#. Run the following commands to install the Salt Project repository and key: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: RHEL 7 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package - of Salt for **RHEL 7**: - - .. parsed-literal:: - - sudo rpm --import \ |rhel7-major-gpg-x86_64|\ - - curl -fsSL \ |rhel7-major-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: RHEL 7 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package - of Salt for **RHEL 7**: - - .. parsed-literal:: - - sudo rpm --import \ |rhel7-minor-gpg-x86_64|\ - - curl -fsSL \ |rhel7-minor-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - -#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. - -#. Install the salt-minion, salt-master, or other Salt components: - - .. code-block:: bash - - sudo yum install salt-master - sudo yum install salt-minion - sudo yum install salt-ssh - sudo yum install salt-syndic - sudo yum install salt-cloud - sudo yum install salt-api - -#. Enable and start service for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst - - -Install Salt on RedHat (RHEL) 7 aarch64 and arm64 -================================================= -To install the :ref:`onedir` packages of Salt on RedHat 7 for aarch64 and -arm64 architectures: - -#. Run the following commands to install the Salt Project repository and key: - - **Click the tab for the Salt version you would like to pin for updates:** - - .. tab-set:: - - .. tab-item:: RHEL 7 (Major onedir) - - To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package - of Salt for **RHEL 7**: - - .. parsed-literal:: - - sudo rpm --import \ |rhel7-major-gpg-arm64|\ - - curl -fsSL \ |rhel7-major-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - .. tab-item:: RHEL 7 (Minor onedir) - - To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package - of Salt for **RHEL 7**: - - .. parsed-literal:: - - sudo rpm --import \ |rhel7-minor-gpg-arm64|\ - - curl -fsSL \ |rhel7-minor-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo - - .. include:: ../_includes/gpg-keys.rst - - -#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. - -#. Install the salt-minion, salt-master, or other Salt components: - - .. code-block:: bash - - sudo yum install salt-master - sudo yum install salt-minion - sudo yum install salt-ssh - sudo yum install salt-syndic - sudo yum install salt-cloud - sudo yum install salt-api - -#. Enable and start service for salt-minion, salt-master, or other Salt - components: - - .. code-block:: bash - - sudo systemctl enable salt-master && sudo systemctl start salt-master - sudo systemctl enable salt-minion && sudo systemctl start salt-minion - sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic - sudo systemctl enable salt-api && sudo systemctl start salt-api - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst - - Browse the repo =============== diff --git a/docs/topics/install-by-operating-system/rocky.rst b/docs/topics/install-by-operating-system/rocky.rst new file mode 100644 index 0000000..181134d --- /dev/null +++ b/docs/topics/install-by-operating-system/rocky.rst @@ -0,0 +1,285 @@ +.. _install-rocky: + +=========== +Rocky Linux +=========== + +For Rocky Linux operating systems (or AlmaLinux, etc.), use the following instructions. + +These instructions explain how to install Salt on Rocky Linux operating systems: + +* `Install Salt on Rocky Linux 9 x86_64`_ +* `Install Salt on Rocky Linux 9 aarch64 and arm64`_ +* `Install Salt on Rocky Linux 8 x86_64`_ +* `Install Salt on Rocky Linux 8 aarch64 and arm64`_ + + +.. include:: ../_includes/what-is-onedir.rst + +.. include:: ../_includes/intro-install-by-os.rst + + +Install Salt on Rocky Linux 9 x86_64 +====================================== +To install the :ref:`onedir` packages of Salt on Rocky Linux 9 for x86_64 +architecture: + +#. Run the following commands to install the Salt Project repository and key: + + **Click the tab for the Salt version you would like to pin for updates:** + + .. tab-set:: + + .. tab-item:: Rocky Linux 9 (Major onedir) + + To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **Rocky Linux 9**: + + .. parsed-literal:: + + sudo rpm --import \ |rocky9-major-gpg-x86_64|\ + + curl -fsSL \ |rocky9-major-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo + + .. include:: ../_includes/gpg-keys.rst + + .. tab-item:: Rocky Linux 9 (Minor onedir) + + To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package of Salt for **Rocky Linux 9**: + + .. parsed-literal:: + + sudo rpm --import \ |rocky9-minor-gpg-x86_64|\ + + curl -fsSL \ |rocky9-minor-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo + + .. include:: ../_includes/gpg-keys.rst + +#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. + +#. Install the salt-minion, salt-master, or other Salt components: + + .. code-block:: bash + + sudo yum install salt-master + sudo yum install salt-minion + sudo yum install salt-ssh + sudo yum install salt-syndic + sudo yum install salt-cloud + sudo yum install salt-api + +#. Enable and start the services for salt-minion, salt-master, or other Salt + components: + + .. code-block:: bash + + sudo systemctl enable salt-master && sudo systemctl start salt-master + sudo systemctl enable salt-minion && sudo systemctl start salt-minion + sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic + sudo systemctl enable salt-api && sudo systemctl start salt-api + + .. include:: ../_includes/install-dependencies-onedir.rst + +.. include:: ../_includes/post-install-by-os.rst + + +Install Salt on Rocky Linux 9 aarch64 and arm64 +================================================= +To install the :ref:`onedir` packages of Salt on Rocky Linux 9 for aarch64 and +arm64 architectures: + +#. Run the following commands to install the Salt Project repository and key: + + **Click the tab for the Salt version you would like to pin for updates:** + + .. tab-set:: + + .. tab-item:: Rocky Linux 9 (Major onedir) + + To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **Rocky Linux 9**: + + .. parsed-literal:: + + sudo rpm --import \ |rocky9-major-gpg-arm64|\ + + curl -fsSL \ |rocky9-major-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo + + .. include:: ../_includes/gpg-keys.rst + + .. tab-item:: Rocky Linux 9 (Minor onedir) + + To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package of Salt for **Rocky Linux 9**: + + .. parsed-literal:: + + sudo rpm --import \ |rocky9-minor-gpg-arm64|\ + + curl -fsSL \ |rocky9-minor-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo + + .. include:: ../_includes/gpg-keys.rst + +#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. + +#. Install the salt-minion, salt-master, or other Salt components: + + .. code-block:: bash + + sudo yum install salt-master + sudo yum install salt-minion + sudo yum install salt-ssh + sudo yum install salt-syndic + sudo yum install salt-cloud + sudo yum install salt-api + +#. Enable and start the services for salt-minion, salt-master, or other Salt + components: + + .. code-block:: bash + + sudo systemctl enable salt-master && sudo systemctl start salt-master + sudo systemctl enable salt-minion && sudo systemctl start salt-minion + sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic + sudo systemctl enable salt-api && sudo systemctl start salt-api + + .. include:: ../_includes/install-dependencies-onedir.rst + +.. include:: ../_includes/post-install-by-os.rst + + + +Install Salt on Rocky Linux 8 x86_64 +====================================== +To install the :ref:`onedir` packages of Salt on Rocky Linux 8 for x86_64 +architecture: + +#. Run the following commands to install the Salt Project repository and key: + + **Click the tab for the Salt version you would like to pin for updates:** + + .. tab-set:: + + .. tab-item:: Rocky Linux 8 (Major onedir) + + To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **Rocky Linux 8**: + + .. parsed-literal:: + + sudo rpm --import \ |rocky8-major-gpg-x86_64|\ + + curl -fsSL \ |rocky8-major-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo + + .. include:: ../_includes/gpg-keys.rst + + .. tab-item:: Rocky Linux 8 (Minor onedir) + + To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package of Salt for **Rocky Linux 8**: + + .. parsed-literal:: + + sudo rpm --import \ |rocky8-minor-gpg-x86_64|\ + + curl -fsSL \ |rocky8-minor-download-x86_64|\ | sudo tee /etc/yum.repos.d/salt.repo + + .. include:: ../_includes/gpg-keys.rst + +#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. + +#. Install the salt-minion, salt-master, or other Salt components: + + .. code-block:: bash + + sudo yum install salt-master + sudo yum install salt-minion + sudo yum install salt-ssh + sudo yum install salt-syndic + sudo yum install salt-cloud + sudo yum install salt-api + +#. Enable and start the services for salt-minion, salt-master, or other Salt + components: + + .. code-block:: bash + + sudo systemctl enable salt-master && sudo systemctl start salt-master + sudo systemctl enable salt-minion && sudo systemctl start salt-minion + sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic + sudo systemctl enable salt-api && sudo systemctl start salt-api + + .. include:: ../_includes/install-dependencies-onedir.rst + +.. include:: ../_includes/post-install-by-os.rst + + + +Install Salt on Rocky Linux 8 aarch64 and arm64 +================================================= +To install the :ref:`onedir` packages of Salt on Rocky Linux 8 for aarch64 and +arm64 architectures: + +#. Run the following commands to install the Salt Project repository and key: + + **Click the tab for the Salt version you would like to pin for updates:** + + .. tab-set:: + + .. tab-item:: Rocky Linux 8 (Major onedir) + + To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package of Salt for **Rocky Linux 8**: + + .. parsed-literal:: + + sudo rpm --import \ |rocky8-major-gpg-arm64|\ + + curl -fsSL \ |rocky8-major-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo + + .. include:: ../_includes/gpg-keys.rst + + .. tab-item:: Rocky Linux 8 (Minor onedir) + + To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package of Salt for **Rocky Linux 8**: + + .. parsed-literal:: + + sudo rpm --import \ |rocky8-minor-gpg-arm64|\ + + curl -fsSL \ |rocky8-minor-download-arm64|\ | sudo tee /etc/yum.repos.d/salt.repo + + .. include:: ../_includes/gpg-keys.rst + +#. Run ``sudo yum clean expire-cache`` to clear the repository metadata. + +#. Install the salt-minion, salt-master, or other Salt components: + + .. code-block:: bash + + sudo yum install salt-master + sudo yum install salt-minion + sudo yum install salt-ssh + sudo yum install salt-syndic + sudo yum install salt-cloud + sudo yum install salt-api + +#. Enable and start the services for salt-minion, salt-master, or other Salt + components: + + .. code-block:: bash + + sudo systemctl enable salt-master && sudo systemctl start salt-master + sudo systemctl enable salt-minion && sudo systemctl start salt-minion + sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic + sudo systemctl enable salt-api && sudo systemctl start salt-api + + .. include:: ../_includes/install-dependencies-onedir.rst + +.. include:: ../_includes/post-install-by-os.rst + + +Browse the repo +=============== + +.. card:: Browse the repo for Rocky Linux packages + :class-card: sd-border-1 + :link: https://repo.saltproject.io/salt/py3/redhat/ + :width: 50% + + :bdg-primary:`Rocky Linux` + |supported-release-1-badge| diff --git a/docs/topics/install-by-operating-system/ubuntu.rst b/docs/topics/install-by-operating-system/ubuntu.rst index e3558d0..2001ba0 100644 --- a/docs/topics/install-by-operating-system/ubuntu.rst +++ b/docs/topics/install-by-operating-system/ubuntu.rst @@ -6,6 +6,8 @@ Ubuntu These instructions explain how to install Salt on Debian operating systems: +* `Install Salt on Ubuntu 24.04 (Noble) amd64`_ +* `Install Salt on Ubuntu 24.04 (Noble) arm64`_ * `Install Salt on Ubuntu 22.04 (Jammy) amd64`_ * `Install Salt on Ubuntu 22.04 (Jammy) arm64`_ * `Install Salt on Ubuntu 20.04 (Focal) amd64`_ @@ -16,6 +18,140 @@ These instructions explain how to install Salt on Debian operating systems: .. include:: ../_includes/intro-install-by-os.rst +Install Salt on Ubuntu 24.04 (Noble) amd64 +========================================== +To install the :ref:`onedir` packages of Salt on Ubuntu 24.04 (Noble) for +amd64 architecture: + +#. Run the following commands to import the Salt Project repository key, and to + create the apt sources list file: + + **Click the tab for the Salt version you would like to pin for updates:** + + .. tab-set:: + + .. tab-item:: Ubuntu 24.04 (Noble) (Major onedir) + + To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package + of Salt for **Ubuntu 24.04 (Noble)**: + + .. parsed-literal:: + + sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu24-major-gpg-amd64|\ + + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |ubuntu24-major-download-amd64|\" | sudo tee /etc/apt/sources.list.d/salt.list + + .. include:: ../_includes/gpg-keys.rst + + .. tab-item:: Ubuntu 24.04 (Noble) (Minor onedir) + + To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package + of Salt for **Ubuntu 24.04 (Noble)**: + + .. parsed-literal:: + + sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu24-minor-gpg-amd64|\ + + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=amd64] \ |ubuntu24-minor-download-amd64|\" | sudo tee /etc/apt/sources.list.d/salt.list + + .. include:: ../_includes/gpg-keys.rst + + +#. Run ``sudo apt-get update`` to update your packages. + +#. Install the salt-minion, salt-master, or other Salt components: + + .. code-block:: bash + + sudo apt-get install salt-master + sudo apt-get install salt-minion + sudo apt-get install salt-ssh + sudo apt-get install salt-syndic + sudo apt-get install salt-cloud + sudo apt-get install salt-api + +#. Enable and start the services for salt-minion, salt-master, or other Salt + components: + + .. code-block:: bash + + sudo systemctl enable salt-master && sudo systemctl start salt-master + sudo systemctl enable salt-minion && sudo systemctl start salt-minion + sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic + sudo systemctl enable salt-api && sudo systemctl start salt-api + + .. include:: ../_includes/install-dependencies-onedir.rst + +.. include:: ../_includes/post-install-by-os.rst + + +Install Salt on Ubuntu 24.04 (Noble) arm64 +====================================================== +To install the :ref:`onedir` packages of Salt on Ubuntu 24.04 (Noble) for +arm64 architecture: + +#. Run the following commands to import the Salt Project repository key, and to + create the apt sources list file: + + **Click the tab for the Salt version you would like to pin for updates:** + + .. tab-set:: + + .. tab-item:: Ubuntu 24.04 (Noble) (Major onedir) + + To pin your Salt upgrades to the :ref:`major` :ref:`onedir` package + of Salt for **Ubuntu 24.04 (Noble)**: + + .. parsed-literal:: + + sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu24-major-gpg-arm64|\ + + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=arm64] \ |ubuntu24-major-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list + + .. include:: ../_includes/gpg-keys.rst + + .. tab-item:: Ubuntu 24.04 (Noble) (Minor onedir) + + To pin your Salt upgrades to the :ref:`minor` :ref:`onedir` package + of Salt for **Ubuntu 24.04 (Noble)**: + + .. parsed-literal:: + + sudo curl -fsSL -o /etc/apt/keyrings/salt-archive-keyring-2023.gpg \ |ubuntu24-minor-gpg-arm64|\ + + echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2023.gpg arch=arm64] \ |ubuntu24-minor-download-arm64|\" | sudo tee /etc/apt/sources.list.d/salt.list + + .. include:: ../_includes/gpg-keys.rst + + +#. Run ``sudo apt-get update`` to update your packages. + +#. Install the salt-minion, salt-master, or other Salt components: + + .. code-block:: bash + + sudo apt-get install salt-master + sudo apt-get install salt-minion + sudo apt-get install salt-ssh + sudo apt-get install salt-syndic + sudo apt-get install salt-cloud + sudo apt-get install salt-api + +#. Enable and start the services for salt-minion, salt-master, or other Salt + components: + + .. code-block:: bash + + sudo systemctl enable salt-master && sudo systemctl start salt-master + sudo systemctl enable salt-minion && sudo systemctl start salt-minion + sudo systemctl enable salt-syndic && sudo systemctl start salt-syndic + sudo systemctl enable salt-api && sudo systemctl start salt-api + + .. include:: ../_includes/install-dependencies-onedir.rst + +.. include:: ../_includes/post-install-by-os.rst + + Install Salt on Ubuntu 22.04 (Jammy) amd64 ========================================== To install the :ref:`onedir` packages of Salt on Ubuntu 22.04 (Jammy) for diff --git a/docs/topics/salt-supported-operating-systems.rst b/docs/topics/salt-supported-operating-systems.rst index 68729af..bf0ec3c 100644 --- a/docs/topics/salt-supported-operating-systems.rst +++ b/docs/topics/salt-supported-operating-systems.rst @@ -34,14 +34,14 @@ Overview of supported operating systems - Yes - Yes - Full - - Yes + - * - `AlmaLinux`_ 9 - x86_64, aarch64 / arm64 - Yes - Yes - Full - - Yes + - * - `Amazon Linux`_ 2 - x86_64, aarch64 / arm64 @@ -64,20 +64,6 @@ Overview of supported operating systems - Reasonable - Yes - * - `CentOS`_ 7 - - x86_64, aarch64 / arm64 - - Yes - - Yes - - Full - - Yes - - * - `CentOS`_ Stream 8 - - x86_64, aarch64 / arm64 - - Yes - - Yes - - Full - - - * - `CentOS`_ Stream 9 - x86_64, aarch64 / arm64 - Yes @@ -99,27 +85,13 @@ Overview of supported operating systems - Full - Yes - * - `Fedora`_ 39 + * - `Fedora`_ 40 - x86_64, aarch64 / arm64 - Yes - Yes - Full - Yes - * - `FreeBSD`_ 12.4 - - - - Yes - - Yes - - Reasonable - - - - * - `FreeBSD`_ 13.1 - - - - Yes - - Yes - - Reasonable - - - * - `macOS`_ 12 - x86_64 - @@ -128,27 +100,20 @@ Overview of supported operating systems - * - `macOS`_ 13 - - x86_64 - - - - Yes - - Full - - - - * - `macOS`_ 13 - - arm64 + - x86_64, arm64 - - Yes - Full - - * - `openSUSE`_ Leap 15.4 + * - `openSUSE`_ Leap 15.5 - - Yes - Yes - Reasonable - - + - Yes - * - `Oracle Linux`_ 7, 8, 9 + * - `Oracle Linux`_ 8, 9 - x86_64, aarch64 / arm64 - Yes - Yes @@ -169,21 +134,28 @@ Overview of supported operating systems - Full - - * - `RedHat`_ 7 + * - `RedHat`_ 8 - x86_64, aarch64 / arm64 - Yes - Yes - Full - Yes - * - `RedHat`_ 8 + * - `RedHat`_ 9 - x86_64, aarch64 / arm64 - Yes - Yes - Full - Yes - * - `RedHat`_ 9 + * - `Rocky Linux`_ 8 + - x86_64, aarch64 / arm64 + - Yes + - Yes + - Full + - Yes + + * - `Rocky Linux`_ 9 - x86_64, aarch64 / arm64 - Yes - Yes @@ -197,7 +169,7 @@ Overview of supported operating systems - Full - - * - `SLES`_ 15 SP4 + * - `SLES`_ 15 SP5 - - Yes - Yes @@ -218,6 +190,13 @@ Overview of supported operating systems - Full - Yes + * - `Ubuntu`_ 24.04 + - amd64, arm64 + - Yes + - Yes + - Full + - Yes + * - `Windows`_ Desktop 10 - x86, AMD64 - @@ -292,7 +271,7 @@ architectures: * - RedHat - * x86_64 * aarch64 / amd64 - - RedHat, CentOS, Fedora + - RedHat, CentOS, Rocky Linux, Fedora * - Windows - * x86 @@ -365,13 +344,12 @@ Amazon Linux 2 and 2023 are supported. CentOS ------ -CentOS versions through Production Phase 3 Support. Versions in ELS are not -supported by the Salt Project. +Only CentOS Stream 9 is supported. Debian ------ -Debian stable, oldstable, and oldoldstable versions. +Debian stable, oldstable, and oldoldstable (if it is not EOL) versions. https://wiki.debian.org/DebianReleases @@ -389,6 +367,11 @@ supported by the Salt Project. https://access.redhat.com/support/policy/updates/errata +Rocky Linux +----------- +Actively supported versions of Rocky Linux. + + macOS ----- The latest three versions of macOS, including arm64 (M Series). @@ -396,7 +379,7 @@ The latest three versions of macOS, including arm64 (M Series). Oracle Linux ------------ -Oracle Linux versions 7, 8, and 9. +Oracle Linux versions 8 and 9. https://www.oracle.com/technetwork/server-storage/linux/overview/index.html diff --git a/docs/topics/upgrade.rst b/docs/topics/upgrade.rst index 0da0a4b..bf07a02 100644 --- a/docs/topics/upgrade.rst +++ b/docs/topics/upgrade.rst @@ -82,7 +82,7 @@ To upgrade Salt: - To reconfigure your repository from a pinned release to the latest release, you can either update the appropriate .repo file or uninstall the existing repo RPM and install the latest repo RPM. See - :ref:`install-rhel` and :ref:`install-centos` for more information. + :ref:`install-rhel`, :ref:`install-centos`, or :ref:`install-rocky` for more information. For additional information on configuring yum repositories, refer to your distribution's documentation. From fe01eaa54df75752353e22cdb8f9e8daadeeab69 Mon Sep 17 00:00:00 2001 From: ScriptAutomate Date: Tue, 30 Jul 2024 15:06:29 -0500 Subject: [PATCH 15/17] Skip ubuntu 24.04 URL placeholders in brok --- .brokignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.brokignore b/.brokignore index eda4997..3f0467e 100644 --- a/.brokignore +++ b/.brokignore @@ -21,6 +21,7 @@ https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/minor/3006.X https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/minor/3006.X https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/minor/3006.X https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/minor/3006.X +https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/minor/3006.X https://saltstack.gitlab.io/open/docs/salt-install-guide https://twitter.com/intent/follow?screen_name=Salt_Project_OS https://www.example.com From cb66c7459c797f353918d84fa0ef8f9c7241f0ca Mon Sep 17 00:00:00 2001 From: Derek <4846166-ScriptAutomate@users.noreply.gitlab.com> Date: Thu, 1 Aug 2024 19:33:37 +0000 Subject: [PATCH 16/17] [3006.x] Fix ubuntu 24.04 install codename --- docs/_templates/sitevars.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/_templates/sitevars.rst b/docs/_templates/sitevars.rst index 3184e06..05f467d 100644 --- a/docs/_templates/sitevars.rst +++ b/docs/_templates/sitevars.rst @@ -194,18 +194,18 @@ .. |rhel7-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/redhat/7/arm64/minor/CURRENT_MINOR.repo .. |ubuntu24-latest-gpg-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg -.. |ubuntu24-latest-download-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/latest jammy main +.. |ubuntu24-latest-download-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/latest noble main .. |ubuntu24-major-gpg-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg -.. |ubuntu24-major-download-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/CURRENT_MAJOR jammy main +.. |ubuntu24-major-download-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/CURRENT_MAJOR noble main .. |ubuntu24-minor-gpg-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg -.. |ubuntu24-minor-download-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/minor/CURRENT_MINOR jammy main +.. |ubuntu24-minor-download-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/amd64/minor/CURRENT_MINOR noble main .. |ubuntu24-latest-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/SALT-PROJECT-GPG-PUBKEY-2023.gpg -.. |ubuntu24-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/latest jammy main +.. |ubuntu24-latest-download-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/latest noble main .. |ubuntu24-major-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/SALT-PROJECT-GPG-PUBKEY-2023.gpg -.. |ubuntu24-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/CURRENT_MAJOR jammy main +.. |ubuntu24-major-download-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/CURRENT_MAJOR noble main .. |ubuntu24-minor-gpg-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/SALT-PROJECT-GPG-PUBKEY-2023.gpg -.. |ubuntu24-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/minor/CURRENT_MINOR jammy main +.. |ubuntu24-minor-download-arm64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/24.04/arm64/minor/CURRENT_MINOR noble main .. |ubuntu22-latest-gpg-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/SALT-PROJECT-GPG-PUBKEY-2023.gpg .. |ubuntu22-latest-download-amd64| replace:: https://repo.saltproject.io/salt/py3/ubuntu/22.04/amd64/latest jammy main From 8a52566ac9ba86027a7a1333fb0724edd884b030 Mon Sep 17 00:00:00 2001 From: Derek <4846166-ScriptAutomate@users.noreply.gitlab.com> Date: Tue, 29 Oct 2024 00:08:12 +0000 Subject: [PATCH 17/17] Drop arch linux and FreeBSD refs --- docs/topics/bootstrap.rst | 2 +- docs/topics/downloads.rst | 2 +- .../install-by-operating-system/arch.rst | 43 ---------- .../install-by-operating-system/freebsd.rst | 80 ------------------- .../salt-supported-operating-systems.rst | 18 ----- 5 files changed, 2 insertions(+), 143 deletions(-) delete mode 100644 docs/topics/install-by-operating-system/arch.rst delete mode 100644 docs/topics/install-by-operating-system/freebsd.rst diff --git a/docs/topics/bootstrap.rst b/docs/topics/bootstrap.rst index 1fd9705..576b9e4 100644 --- a/docs/topics/bootstrap.rst +++ b/docs/topics/bootstrap.rst @@ -14,7 +14,7 @@ Bash shell script that installs Salt on any Linux/Unix platform. The script installs ``salt-master`` and ``salt-minion`` system packages and enables Salt services automatically. -This script only works on Unix-like operating systems such as FreeBSD and Linux. +This script only works on Unix-like operating systems such as Linux. For most installation, the best options are typically ``stable`` and a version. ``-P`` is also needed for Ubuntu-based distributions. If the bootstrap script diff --git a/docs/topics/downloads.rst b/docs/topics/downloads.rst index 60abbf4..5a1adcc 100644 --- a/docs/topics/downloads.rst +++ b/docs/topics/downloads.rst @@ -17,7 +17,7 @@ Welcome to the Salt download page! * PY2 packages are in the `archive repository `__ under the ``yum`` and ``apt`` directories. Other PY2 packages may be found under their respective directories, such as ``osx``, ``windows``, - ``freebsd``, and so forth. + and so forth. The following sections provide links to the repository for each operating diff --git a/docs/topics/install-by-operating-system/arch.rst b/docs/topics/install-by-operating-system/arch.rst deleted file mode 100644 index 3f0fd9f..0000000 --- a/docs/topics/install-by-operating-system/arch.rst +++ /dev/null @@ -1,43 +0,0 @@ -.. _install-arch: - -========== -Arch Linux -========== - -Salt (stable) is available through the Arch Linux Official repositories. You can -also get ``-git`` packages in the Arch User repositories (AUR) as well. - -These instructions explain how to install Salt on Arch operating systems: - -* `Install Salt on Arch Linux`_ - -.. include:: ../_includes/intro-install-by-os.rst - - -Install Salt on Arch Linux -========================== -To install the stable release of Salt on Arch Linux: - -#. Run the following command: - - .. code-block:: bash - - pacman -S salt - -#. To activate the master or minion using ``systemctl``: - - .. code-block:: bash - - systemctl enable salt-master.service - systemctl enable salt-minion.service - -#. To start the master service using ``systemctl``: - - .. code-block:: bash - - systemctl start salt-master - - .. include:: ../_includes/install-dependencies-onedir.rst - - -.. include:: ../_includes/post-install-by-os.rst diff --git a/docs/topics/install-by-operating-system/freebsd.rst b/docs/topics/install-by-operating-system/freebsd.rst deleted file mode 100644 index b6cd4e2..0000000 --- a/docs/topics/install-by-operating-system/freebsd.rst +++ /dev/null @@ -1,80 +0,0 @@ -.. _install-freebsd: - -======= -FreeBSD -======= - -Salt is available in the FreeBSD ports tree at -`sysutils/py-salt `_. - -These instructions explain how to install Salt on AR operating -systems: - -* `Install Salt on FreeBSD`_ -* `Install Salt from FreeBSD ports`_ - -.. include:: ../_includes/intro-install-by-os.rst - - -Install Salt on FreeBSD -======================= -To install the stable release of Salt from the official package repository: - -#. Check which version is the default version of Python for Salt on - FreeBSD. See :ref:`salt-python-version-support` for more information. - -#. Run the following command, substituting the version of Python as needed. For - example, to install for Python 3.8: - - .. code-block:: bash - - pkg install py38-salt - -#. To activate the master in ``/etc/rc.conf``: - - .. code-block:: bash - - sysrc salt_master_enable="YES" - -#. To start the master service: - - .. code-block:: bash - - service salt_master start - -#. To activate the minion in ``/etc/rc.conf``: - - .. code-block:: bash - - sysrc salt_minion_enable="YES" - -#. To start the minion service: - - .. code-block:: bash - - service salt_minion start - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst - - -Install Salt from FreeBSD ports -=============================== -To install from FreeBSD ports: - -#. Run the following commands: - - .. code-block:: bash - - cd /usr/ports/sysutils/py-salt - make install - - .. Note:: - - Python 3.7 can be used by setting default Python version to 3.7: - ``echo "DEFAULT_VERSIONS+= python=3.7" >> /etc/make.conf`` - - .. include:: ../_includes/install-dependencies-onedir.rst - -.. include:: ../_includes/post-install-by-os.rst diff --git a/docs/topics/salt-supported-operating-systems.rst b/docs/topics/salt-supported-operating-systems.rst index bf0ec3c..62fa724 100644 --- a/docs/topics/salt-supported-operating-systems.rst +++ b/docs/topics/salt-supported-operating-systems.rst @@ -57,13 +57,6 @@ Overview of supported operating systems - Full - Yes - * - `Arch Linux`_ (latest) - - x86_64, aarch64 - - Yes - - Yes - - Reasonable - - Yes - * - `CentOS`_ Stream 9 - x86_64, aarch64 / arm64 - Yes @@ -426,17 +419,6 @@ operating systems, no guarantee is made as to availability of packages. These guidelines are for reasonable-effort support only. -Arch Linux ----------- -Latest version of Arch Linux. - - -FreeBSD -------- -FreeBSD versions through end-of-life. - -https://www.freebsd.org/security/ - openSUSE --------