From 30d70f2e2e2433321b590be17a4a62f96f9729f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Tue, 24 Apr 2018 19:41:15 +0200 Subject: [PATCH] =?UTF-8?q?D=C3=A9localisation=20de=20jitsi=20comme=20logi?= =?UTF-8?q?ciel=20=C3=A0=20installer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linux/Debian/DebianFamilyPackage.sls | 6 ------ linux/DebianFamily.sls | 2 +- softwares/jitsi.sls | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 softwares/jitsi.sls diff --git a/linux/Debian/DebianFamilyPackage.sls b/linux/Debian/DebianFamilyPackage.sls index db69037..5146395 100644 --- a/linux/Debian/DebianFamilyPackage.sls +++ b/linux/Debian/DebianFamilyPackage.sls @@ -1,14 +1,8 @@ {% if grains['os_family'] == 'Debian' %} -{% set MYKERNEL = salt['grains.get']('kernelrelease') %} Installation des paquets pour toute Debian: pkg.installed: - pkgs: - p7zip - dnsutils - ethtool - {% if 'pve' in MYKERNEL %} - # Do Nothing - {% else %} - - jitsi-meet - {% endif %} {% endif %} diff --git a/linux/DebianFamily.sls b/linux/DebianFamily.sls index 69e7809..e284135 100644 --- a/linux/DebianFamily.sls +++ b/linux/DebianFamily.sls @@ -1,5 +1,5 @@ {% if grains['os_family'] == 'Debian' %} include: - - linux.Debian.DebianFamilyRepo +# - linux.Debian.DebianFamilyRepo - linux.Debian.DebianFamilyPackage {% endif %} diff --git a/softwares/jitsi.sls b/softwares/jitsi.sls new file mode 100644 index 0000000..a0d2ea8 --- /dev/null +++ b/softwares/jitsi.sls @@ -0,0 +1,18 @@ +{% if grains['os_family'] == 'Debian' %} + {% set MYKERNEL = salt['grains.get']('kernelrelease') %} + {% if 'pve' in MYKERNEL %} + # Do Nothing + {% else %} + jitsi stable Repository: + pkgrepo.managed: + - name: deb https://download.jitsi.org stable/ + - file: /etc/apt/sources.list.d/jitsi-stable.list + - key_url: https://download.jitsi.org/jitsi-key.gpg.key + - enabled: 1 + + Installation des paquets pour toute Debian: + pkg.installed: + - pkgs: + - jitsi-meet + {% endif %} +{% endif %}