saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #28022 from jacobhammons/install

Browse source 
Updated Debian and Ubuntu repo paths with new structure for 2015.8.1
This commit is contained in:
jacobhammons 2015-10-16 09:31:36 -06:00
commit 5286c01f39
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/topics/installation/debian.rst
View file

@ -12,19 +12,24 @@ Installation from the SaltStack Repository
2015.8.0 and later packages for Debian 8 (Jessie) are available in the
SaltStack repository.
.. important::
The repository folder structure changed between 2015.8.0 and 2015.8.1. If you
previously configured this repository, verify that your paths contain
``latest``.
To install using the SaltStack repository:
#. Run the following command to import the SaltStack repository key:
.. code-block:: bash
wget -O - https://repo.saltstack.com/apt/debian/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
wget -O - https://repo.saltstack.com/apt/debian/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
#. Add the following line to ``/etc/apt/sources.list``:
.. code-block:: bash
deb http://repo.saltstack.com/apt/debian jessie contrib
deb http://repo.saltstack.com/apt/debian/latest jessie main
#. Run ``sudo apt-get update``.

13
doc/topics/installation/ubuntu.rst
View file

@ -10,6 +10,11 @@ Installation from the SaltStack Repository
2015.8.0 and later packages for Ubuntu 14 (Trusty) and Ubuntu 12 (Precise) are
available in the SaltStack repository.
.. important::
The repository folder structure changed between 2015.8.0 and 2015.8.1. If you
previously configured this repository, verify that your paths contain
``latest``.
To install using the SaltStack repository:
#. Run the following command to import the SaltStack repository key:
@ -18,13 +23,13 @@ To install using the SaltStack repository:
.. code-block:: bash
wget -O - https://repo.saltstack.com/apt/ubuntu/ubuntu14/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
wget -O - https://repo.saltstack.com/apt/ubuntu/ubuntu14/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
Ubuntu 12:
.. code-block:: bash
wget -O - https://repo.saltstack.com/apt/ubuntu/ubuntu12/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
wget -O - https://repo.saltstack.com/apt/ubuntu/ubuntu12/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
#. Add the following line to ``/etc/apt/sources.list``:
@ -32,13 +37,13 @@ To install using the SaltStack repository:
.. code-block:: bash
deb http://repo.saltstack.com/apt/ubuntu/ubuntu14 trusty main
deb http://repo.saltstack.com/apt/ubuntu/latest/ubuntu14 trusty main
Ubuntu 12:
.. code-block:: bash
deb http://repo.saltstack.com/apt/ubuntu/ubuntu12 precise main
deb http://repo.saltstack.com/apt/ubuntu/latest/ubuntu12 precise main
#. Run ``sudo apt-get update``.