From 1201bad3950d9fb96235ac589dc8614b0eb6defe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Sat, 8 Dec 2018 17:57:06 +0100 Subject: [PATCH] =?UTF-8?q?Am=C3=A9ioration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softwares/SaltRepo.sls | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/softwares/SaltRepo.sls b/softwares/SaltRepo.sls index f2f41de..ddc718e 100644 --- a/softwares/SaltRepo.sls +++ b/softwares/SaltRepo.sls @@ -1,17 +1,20 @@ -# Installation du logiciel ATOM +# Mise en place du bon repo SaltStack {% if grains['kernel'] == 'Linux' %} {% if grains['os_family'] == 'Debian' %} + {% set ARCH=grains['osarch'] %} saltstack repository: pkgrepo.managed: {% if grains['os'] == 'Debian' %} {% set OSNAME=grains['oscodename'] %} {% set OSNUMBER=grains['osmajorrelease'] %} - - name: 'deb http://repo.saltstack.com/apt/debian/{{OSNUMBER}}/amd64/latest {{OSNAME}} main' - - key_url: 'https://repo.saltstack.com/apt/debian/{{OSNUMBER}}/amd64/latest/SALTSTACK-GPG-KEY.pub' + - name: 'deb http://repo.saltstack.com/apt/debian/{{OSNUMBER}}/{{ARCH}}/latest {{OSNAME}} main' + - key_url: 'https://repo.saltstack.com/apt/debian/{{OSNUMBER}}/{{ARCH}}/latest/SALTSTACK-GPG-KEY.pub' {% elif grains['os'] == 'Ubuntu' %} - - key_url: 'https://repo.saltstack.com/apt/ubuntu/18.04/amd64/latest/SALTSTACK-GPG-KEY.pub' - - name: 'deb http://repo.saltstack.com/apt/ubuntu/18.04/amd64/latest bionic main' + {% set OSNAME=grains['oscodename'] %} + {% set OSNUMBER=grains['osrelease'] %} + - key_url: 'https://repo.saltstack.com/apt/ubuntu/{{OSNUMBER}}/{{ARCH}}/latest/SALTSTACK-GPG-KEY.pub' + - name: 'deb http://repo.saltstack.com/apt/ubuntu/{{OSNUMBER}}/{{ARCH}}/latest {{OSNAME}} main' {% endif %} - humanname: SaltStack Repository - file: /etc/apt/sources.list.d/saltstack.list