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 #31477 from vutny/correct-doc-install-ubuntu

Browse source 
Correct installation documentation for Ubuntu
This commit is contained in:
Mike Place 2016-02-25 09:01:38 -07:00
commit 3905dd81d3
3 changed files with 47 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,8 @@
.. _installation-debian:
===================
Debian Installation
===================
================
Debian GNU/Linux
================
.. _installation-debian-repo:
@ -39,13 +39,7 @@ To install using the SaltStack repository:
#. Run ``sudo apt-get update``.
#. Install the salt-minion, salt-master, or other Salt components:
- ``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``
#. Now go to the :ref:`packages installation <debian-install-pkgs>` section.
Installation from the Community Repository
==========================================
@ -102,7 +96,6 @@ For Stretch, the following line is needed in either
deb http://debian.saltstack.com/debian stretch-saltstack main
Sid (Unstable)
--------------
@ -113,9 +106,8 @@ For Sid, the following line is needed in either
deb http://debian.saltstack.com/debian unstable main
Import the repository key.
--------------------------
Import the repository key
-------------------------
You will need to import the key used for signing.
@ -139,37 +131,30 @@ Update the package database
apt-get update
Install packages
----------------
Install the Salt master, minion, or syndic from the repository with the apt-get
command. These examples each install one daemon, but more than one package name
may be given at a time:
- ``apt-get install salt-master``
- ``apt-get install salt-minion``
- ``apt-get install salt-ssh``
- ``apt-get install salt-syndic``
Installation from the Debian Main Repository
============================================
Stretch (Testing) and Sid (Unstable) distributions are already contain mostly
up-to-date Salt packages built by Debian Salt Team.
up-to-date Salt packages built by Debian Salt Team. You can install Salt
components directly from Debian.
Install Salt components directly from Debian:
.. _debian-install-pkgs:
- ``apt-get install salt-api``
- ``apt-get install salt-cloud``
- ``apt-get install salt-doc``
- ``apt-get install salt-master``
- ``apt-get install salt-minion``
- ``apt-get install salt-proxy``
- ``apt-get install salt-ssh``
- ``apt-get install salt-syndic``
Install Packages
================
.. _Debian-config:
Install the Salt master, minion or other packages from the repository with
the `apt-get` command. These examples each install one of Salt components, but
more than one package name may be given at a time:
- ``apt-get install salt-api``
- ``apt-get install salt-cloud``
- ``apt-get install salt-master``
- ``apt-get install salt-minion``
- ``apt-get install salt-ssh``
- ``apt-get install salt-syndic``
.. _debian-config:
Post-installation tasks
=======================

6
doc/topics/installation/suse.rst
View file

@ -1,6 +1,6 @@
=================
SUSE Installation
=================
====
SUSE
====
With openSUSE 13.2, Salt 2014.1.11 is available in the primary repositories.
The devel:language:python repo will have more up to date versions of salt,

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

@ -1,6 +1,8 @@
===================
Ubuntu Installation
===================
.. _installation-ubuntu:
======
Ubuntu
======
.. _installation-ubuntu-repo:
@ -10,10 +12,15 @@ Installation from the SaltStack Repository
2015.5 and later packages for Ubuntu 14 (Trusty) and Ubuntu 12 (Precise) are
available in the SaltStack repository.
.. note::
While Salt packages are built for all Ubuntu supported CPU architectures
(``i386`` and ``amd64``), some of the dependencies avaivable from SaltStack
corporate repository are only suitable for ``amd64`` systems.
.. important::
The repository folder structure changed in the 2015.8.3 release, though the
previous repository structure that was documented in 2015.8.1 can continue to
be used.
The repository folder structure changed in the 2015.8.3 release, though the
previous repository structure that was documented in 2015.8.1 can continue to
be used.
To install using the SaltStack repository:
@ -47,18 +54,7 @@ To install using the SaltStack repository:
#. Run ``sudo apt-get update``.
#. Install the salt-minion, salt-master, or other Salt components:
- ``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``
Post-installation tasks
-----------------------
Now, go to the :doc:`Configuring Salt </ref/configuration/index>` page.
#. Now go to the :ref:`packages installation <ubuntu-install-pkgs>` section.
Installation from the Community Repository
==========================================
@ -115,14 +111,17 @@ After adding the repository, update the package management database:
sudo apt-get update
.. _ubuntu-install-pkgs:
Install packages
Install Packages
================
Install the Salt master, minion, or syndic from the repository with the apt-get
command. These examples each install one daemon, but more than one package name
may be given at a time:
Install the Salt master, minion or other packages from the repository with
the `apt-get` command. These examples each install one of Salt components, but
more than one package name may be given at a time:
- ``apt-get install salt-api``
- ``apt-get install salt-cloud``
- ``apt-get install salt-master``
- ``apt-get install salt-minion``
- ``apt-get install salt-ssh``
@ -134,4 +133,3 @@ Post-installation tasks
=======================
Now go to the :doc:`Configuring Salt</ref/configuration/index>` page.