Finalisation

softwares/bareosclient.sls

@@ -1,22 +1,32 @@
 # Installation du client bareos
 
 {% if grains['kernel'] == 'Linux' %}
-
+{% set ARCH=grains['osarch'] %}
-atom_repository:
+{% set MAJOR=grains['osmajorrelease'] %}
+{% SET CURVER='17.2' %}
+bareod_repository:
   pkgrepo.managed:
   {% if grains['os_family'] == 'RedHat' %}
-    - humanname: Atom Repository for $releasever - $basearch
+    - humanname: BareOS Repository for $releasever - $basearch
-    - baseurl: 'https://packagecloud.io/AtomEditor/atom/el/7/$basearch'
+    {% if grains['os'] == 'Fedora' %}
+    - baseurl: 'http://download.bareos.org/bareos/release/latest/Fedora_26/'
+    - gpgkey: 'http://download.bareos.org/bareos/release/{{CURVER}}/Fedora_26/repodata/repomd.xml.key'
+    {% elif grains['os'] == 'Centos' %}
+    - baseurl: 'http://download.bareos.org/bareos/release/latest/CentOS_{{MAJOR}}/'
+    - gpgkey: 'http://download.bareos.org/bareos/release/{{CURVER}}/CentOS_{{MAJOR}}/repodata/repomd.xml.key'
+    {% elif grains['os'] == 'Redhat' %}
+    - baseurl: 'http://download.bareos.org/bareos/release/latest/RHEL_{{MAJOR}}/'
+    - gpgkey: 'http://download.bareos.org/bareos/release/{{CURVER}}/CentOS_{{MAJOR}}/repodata/repomd.xml.key'
+    {% endif %}
     - enabled: 1
     - gpgcheck: 0
     - repo_gpgcheck: 1
-    - gpgkey: 'https://packagecloud.io/AtomEditor/atom/gpgkey'
     - skip_if_unavailable: True
   {% elif grains['os_family'] == 'Debian' %}
-    - name: 'deb http://download.bareos.org/bareos/release/latest/Debian_9.0/ /'
+    - name: 'deb http://download.bareos.org/bareos/release/latest/Debian_{{MAJOR}}.0/ /'
     - humanname: Repository Bareos
     - file: /etc/apt/sources.list.d/bareos.list
-    - key_url: 'http://download.bareos.org/bareos/release/latest/Debian_9.0/Release.key'
+    - key_url: 'http://download.bareos.org/bareos/release/latest/Debian_{{MAJOR}}.0/Release.key'
 
   {% endif %}