Verified Commit d8d1fd89 authored by Sven enniK's avatar Sven enniK
Browse files

update salt version for debian 9 and ubuntu 16.04

parent 58dd30ac

init_server.sh

+4 −4
Changes for init_server.sh: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ check_salt_repo() { 
	# repos needs also a check in salt/freifunk/base/salt-minion/init.sls

	case "$1" in

		debian9 )

			wget -O - https://repo.saltstack.com/apt/debian/9/amd64/2018.3/SALTSTACK-GPG-KEY.pub | apt-key add -

			echo 'deb http://repo.saltstack.com/apt/debian/9/amd64/2018.3 stretch main' | tee /etc/apt/sources.list.d/saltstack.list

			wget -O - https://repo.saltstack.com/apt/debian/9/amd64/2019.2/SALTSTACK-GPG-KEY.pub | apt-key add -

			echo 'deb http://repo.saltstack.com/apt/debian/9/amd64/2019.2 stretch main' | tee /etc/apt/sources.list.d/saltstack.list

			;;

		ubuntu16 )

			wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2018.3/SALTSTACK-GPG-KEY.pub | apt-key add -

			echo 'deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2018.3 xenial main' | tee /etc/apt/sources.list.d/saltstack.list

			wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2019.2/SALTSTACK-GPG-KEY.pub | apt-key add -

			echo 'deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2019.2 xenial main' | tee /etc/apt/sources.list.d/saltstack.list

			;;

	esac

}

salt/freifunk/base/salt-minion/init.sls

+4 −4
Changes for salt/freifunk/base/salt-minion/init.sls: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -7,24 +7,24 @@ salt-minion: 
  {% if grains['os'] == 'Debian' and grains['oscodename'] == 'stretch' %}

  pkgrepo.managed:

    - humanname: SaltStack

    - name: deb http://repo.saltstack.com/apt/debian/9/amd64/2018.3 stretch main

    - name: deb http://repo.saltstack.com/apt/debian/9/amd64/2019.2 stretch main

    - dist: stretch

    - file: /etc/apt/sources.list.d/saltstack.list

    - require_in:

      - pkg: salt-minion

    - gpgcheck: 1

    - key_url: https://repo.saltstack.com/apt/debian/9/amd64/2018.3/SALTSTACK-GPG-KEY.pub

    - key_url: https://repo.saltstack.com/apt/debian/9/amd64/2019.2/SALTSTACK-GPG-KEY.pub



  {% elif grains['os'] == 'Ubuntu' and grains['oscodename'] == 'xenial' %}

  pkgrepo.managed:

    - humanname: SaltStack

    - name: deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2018.3 xenial main

    - name: deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2019.2 xenial main

    - dist: xenial

    - file: /etc/apt/sources.list.d/saltstack.list

    - require_in:

      - pkg: salt-minion

    - gpgcheck: 1

    - key_url: https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2018.3/SALTSTACK-GPG-KEY.pub

    - key_url: https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2019.2/SALTSTACK-GPG-KEY.pub



  {% else %}

  file.absent: