Merge pull request #29417 from jacobhammons/repo-install-updates

Repo install updates
This commit is contained in:
jacobhammons 2015-12-03 19:39:41 -07:00
commit ab890b632a
5 changed files with 56 additions and 50 deletions

View file

@ -9,13 +9,13 @@ Debian Installation
Installation from the SaltStack Repository
==========================================
2015.8.0 and later packages for Debian 8 (Jessie) are available in the
2015.5 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``.
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:
@ -23,13 +23,13 @@ To install using the SaltStack repository:
.. code-block:: bash
wget -O - https://repo.saltstack.com/apt/debian/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
https://repo.saltstack.com/apt/debian/8/amd64/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/latest jessie main
deb http://repo.saltstack.com/apt/debian/8/amd64/latest jessie main
#. Run ``sudo apt-get update``.
@ -39,6 +39,7 @@ To install using the SaltStack repository:
- ``apt-get install salt-minion``
- ``apt-get install salt-ssh``
- ``apt-get install salt-syndic``
- ``apt-get install salt-cloud``
Post-installation tasks
-----------------------

View file

@ -15,9 +15,14 @@ Report any bugs or issues on the `issue tracker`__.
Installation from the SaltStack Repository
==========================================
2015.8.0 and later packages for RHEL 5, 6, and 7 are available in the
2015.5 and later packages for RHEL 5, 6, and 7 are available in the
SaltStack repository.
.. 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.
To install using the SaltStack repository:
#. Run one of the following commands based on your version to import the SaltStack repository key:
@ -26,66 +31,45 @@ To install using the SaltStack repository:
.. code-block:: bash
wget https://repo.saltstack.com/yum/rhel7/SALTSTACK-GPG-KEY.pub
rpm --import SALTSTACK-GPG-KEY.pub
rm -f SALTSTACK-GPG-KEY.pub
rpm --import https://repo.saltstack.com/yum/redhat/7/x86_64/latest/SALTSTACK-GPG-KEY.pub
Version 6:
.. code-block:: bash
wget https://repo.saltstack.com/yum/rhel6/SALTSTACK-GPG-KEY.pub
rpm --import SALTSTACK-GPG-KEY.pub
rm -f SALTSTACK-GPG-KEY.pub
rpm --import https://repo.saltstack.com/yum/redhat/6/x86_64/latest/SALTSTACK-GPG-KEY.pub
Version 5:
.. code-block:: bash
wget https://repo.saltstack.com/yum/rhel5/SALTSTACK-EL5-GPG-KEY.pub
wget https://repo.saltstack.com/yum/redhat/5/x86_64/latest/SALTSTACK-EL5-GPG-KEY.pub
rpm --import SALTSTACK-EL5-GPG-KEY.pub
rm -f SALTSTACK-EL5-GPG-KEY.pub
#. Save the following file to ``/etc/yum.repos.d/saltstack.repo``:
Version 7:
Version 7 and 6:
.. code-block:: cfg
####################
# Enable SaltStack's package repository
[saltstack-repo]
name=SaltStack repo for RHEL/CentOS 7
baseurl=https://repo.saltstack.com/yum/rhel7
name=SaltStack repo for RHEL/CentOS $releasever
baseurl=https://repo.saltstack.com/yum/redhat/$releasever/$basearch/latest
enabled=1
gpgcheck=1
gpgkey=https://repo.saltstack.com/yum/rhel7/SALTSTACK-GPG-KEY.pub
Version 6:
.. code-block:: cfg
####################
# Enable SaltStack's package repository
[saltstack-repo]
name=SaltStack repo for RHEL/CentOS 6
baseurl=https://repo.saltstack.com/yum/rhel6
enabled=1
gpgcheck=1
gpgkey=https://repo.saltstack.com/yum/rhel6/SALTSTACK-GPG-KEY.pub
gpgkey=https://repo.saltstack.com/yum/redhat/$releasever/$basearch/latest/$releaseverSALTSTACK-GPG-KEY.pub
Version 5:
.. code-block:: cfg
####################
# Enable SaltStack's package repository
[saltstack-repo]
name=SaltStack repo for RHEL/CentOS 5
baseurl=https://repo.saltstack.com/yum/rhel5
name=SaltStack repo for RHEL/CentOS $releasever
baseurl=https://repo.saltstack.com/yum/redhat/$releasever/$basearch/latest
enabled=1
gpgcheck=1
gpgkey=https://repo.saltstack.com/yum/rhel5/SALTSTACK-EL5-GPG-KEY.pub
gpgkey=https://repo.saltstack.com/yum/redhat/$releasever/$basearch/latest/SALTSTACK-EL5-GPG-KEY.pub
#. Run ``sudo yum clean expire-cache``.

View file

@ -7,13 +7,13 @@ Ubuntu Installation
Installation from the SaltStack Repository
==========================================
2015.8.0 and later packages for Ubuntu 14 (Trusty) and Ubuntu 12 (Precise) are
2015.5 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``.
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:
@ -23,13 +23,13 @@ To install using the SaltStack repository:
.. code-block:: bash
wget -O - https://repo.saltstack.com/apt/ubuntu/ubuntu14/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
wget -O - https://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
Ubuntu 12:
.. code-block:: bash
wget -O - https://repo.saltstack.com/apt/ubuntu/ubuntu12/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
wget -O - https://repo.saltstack.com/apt/ubuntu/12.04/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
#. Add the following line to ``/etc/apt/sources.list``:
@ -37,13 +37,13 @@ To install using the SaltStack repository:
.. code-block:: bash
deb http://repo.saltstack.com/apt/ubuntu/ubuntu14/latest trusty main
deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest trusty main
Ubuntu 12:
.. code-block:: bash
deb http://repo.saltstack.com/apt/ubuntu/ubuntu12/latest precise main
deb http://repo.saltstack.com/apt/ubuntu/12.04/amd64/latest precise main
#. Run ``sudo apt-get update``.
@ -53,6 +53,7 @@ To install using the SaltStack repository:
- ``apt-get install salt-minion``
- ``apt-get install salt-ssh``
- ``apt-get install salt-syndic``
- ``apt-get install salt-cloud``
Post-installation tasks
-----------------------

View file

@ -2,6 +2,16 @@
Salt 2015.5.8 Release Notes
===========================
Security Fix
============
CVE-2015-8034: Saving ``state.sls`` cache data to disk with insecure permissions
This affects users of the ``state.sls`` function. The state run cache on the minion was being created with incorrect permissions. This file could potentially contain sensitive data that was inserted via jinja into the state SLS files. The permissions for this file are now being set correctly. Thanks to @zmalone for bringing this issue to our attention.
Changes
=======
Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
*Generated at: 2015-11-23T23:16:23Z*
@ -126,7 +136,7 @@ Changes:
- **PR** `#28263`_: (*cachedout*) New channel for event.send
- **PR** `#28293`_: (*cachedout*) Minor grammar changes
- **PR** `#28293`_: (*cachedout*) Minor grammar changes
- **PR** `#28271`_: (*gwaters*) Update tutorial documentation

View file

@ -2,6 +2,16 @@
Salt 2015.8.3 Release Notes
===========================
Security Fix
============
CVE-2015-8034: Saving ``state.sls`` cache data to disk with insecure permissions
This affects users of the ``state.sls`` function. The state run cache on the minion was being created with incorrect permissions. This file could potentially contain sensitive data that was inserted via jinja into the state SLS files. The permissions for this file are now being set correctly. Thanks to @zmalone for bringing this issue to our attention.
Changes
=======
Extended changelog courtesy of Todd Stansell (https://github.com/tjstansell/salt-changelogs):
*Generated at: 2015-11-25T00:03:40Z*
@ -54,7 +64,7 @@ Changes:
- **PR** `#29050`_: (*terminalmage*) Make git_pillar global config option docs more prominent
- **PR** `#29048`_: (*nmadhok*) Fix incorrect debug log statement
- **PR** `#29048`_: (*nmadhok*) Fix incorrect debug log statement
- **PR** `#29024`_: (*jfindlay*) cache runner test: add new unit tests
@ -142,7 +152,7 @@ Changes:
- **PR** `#28782`_: (*rallytime*) Fixes to rabbitmq user state
- **PR** `#28789`_: (*nmadhok*) Provide ability to enable/disable customization for newly create VMs using VMware salt-cloud driver
- **PR** `#28789`_: (*nmadhok*) Provide ability to enable/disable customization for newly create VMs using VMware salt-cloud driver
- **PR** `#28768`_: (*mrosedale*) 2015.8
@ -220,7 +230,7 @@ Changes:
- **PR** `#28602`_: (*nasenbaer13*) Allow setting of custom dimensions in asg alarm specification
- **PR** `#28596`_: (*rallytime*) Merge branch '2015.5' into '2015.8'
- **PR** `#28596`_: (*rallytime*) Merge branch '2015.5' into '2015.8'
- **PR** `#28593`_: (*blueyed*) doc: fix typo with salt.states.file: s/preseve/preserve/