From fdb3cd6b02b2c1033bed84707fd2e4785d56efc9 Mon Sep 17 00:00:00 2001 From: Antoine Ouvrard Date: Mon, 18 Jan 2021 18:40:24 +0100 Subject: [PATCH] ajout du jitsi de test pour les hautes-alpes + refactoring des logos --- host_vars/jitsi.komuniki.fr.yml | 2 +- host_vars/kaliop.komuniki.fr.yml | 6 + host_vars/pp.visio.nereide.fr.yml | 3 +- host_vars/visio.imio.be.yml | 2 +- inventory_staging | 3 +- playbook_staging.yml | 13 +- .../{logo-komki.svg => jitsi.komuniki.fr.svg} | 0 .../files/kaliop.komuniki.fr.svg | 259 ++++++++++++++++ .../files/logo_Nereide_monochrome-blanc.svg | 276 ------------------ .../{IMIO_LOGO.svg => visio.imio.be.svg} | 0 roles/jitsi-enable-auth/tasks/main.yml | 2 +- 11 files changed, 284 insertions(+), 282 deletions(-) create mode 100644 host_vars/kaliop.komuniki.fr.yml rename roles/jitsi-add-logo/files/{logo-komki.svg => jitsi.komuniki.fr.svg} (100%) create mode 100644 roles/jitsi-add-logo/files/kaliop.komuniki.fr.svg delete mode 100644 roles/jitsi-add-logo/files/logo_Nereide_monochrome-blanc.svg rename roles/jitsi-add-logo/files/{IMIO_LOGO.svg => visio.imio.be.svg} (100%) diff --git a/host_vars/jitsi.komuniki.fr.yml b/host_vars/jitsi.komuniki.fr.yml index e058397..cef429a 100644 --- a/host_vars/jitsi.komuniki.fr.yml +++ b/host_vars/jitsi.komuniki.fr.yml @@ -1,3 +1,3 @@ --- -jitsi_logo: logo-komki.svg +jitsi_logo: jitsi.komuniki.fr.svg jitsi_logo_url: https://komuniki.fr \ No newline at end of file diff --git a/host_vars/kaliop.komuniki.fr.yml b/host_vars/kaliop.komuniki.fr.yml new file mode 100644 index 0000000..f0ab9a0 --- /dev/null +++ b/host_vars/kaliop.komuniki.fr.yml @@ -0,0 +1,6 @@ +--- +ansible_user: root +jitsi_user: toto +jitsi_pass: titi +jitsi_logo: kaliop.komuniki.fr.svg +jitsi_logo_url: https://www.hautes-alpes.fr/ \ No newline at end of file diff --git a/host_vars/pp.visio.nereide.fr.yml b/host_vars/pp.visio.nereide.fr.yml index e058397..849a570 100644 --- a/host_vars/pp.visio.nereide.fr.yml +++ b/host_vars/pp.visio.nereide.fr.yml @@ -1,3 +1,4 @@ --- -jitsi_logo: logo-komki.svg +ansible_user: root +jitsi_logo: jitsi.komuniki.fr.svg jitsi_logo_url: https://komuniki.fr \ No newline at end of file diff --git a/host_vars/visio.imio.be.yml b/host_vars/visio.imio.be.yml index 1fc0b39..685f162 100644 --- a/host_vars/visio.imio.be.yml +++ b/host_vars/visio.imio.be.yml @@ -1,5 +1,5 @@ --- jitsi_user: imio jitsi_pass: logiciellibre -jitsi_logo: IMIO_LOGO.svg +jitsi_logo: visio.imio.be.svg jitsi_logo_url: https://imio.be \ No newline at end of file diff --git a/inventory_staging b/inventory_staging index 76a82be..4cdacaa 100644 --- a/inventory_staging +++ b/inventory_staging @@ -1 +1,2 @@ -pp.visio.nereide.fr ansible_user=root +pp.visio.nereide.fr +kaliop.komuniki.fr \ No newline at end of file diff --git a/playbook_staging.yml b/playbook_staging.yml index 486fe35..6d32a62 100644 --- a/playbook_staging.yml +++ b/playbook_staging.yml @@ -8,7 +8,18 @@ - role: jitsi-add-logo - role: jitsi-enable-fr-ln - role: jitsi-enable-video-optimisation - - role: jitsi-enable-stats + - role: jitsi-enable-metrics - role: jitsi-enable-calendar tags: - ppnrd + +- hosts: kaliop.komuniki.fr + roles: + - role: jitsi-pre-install + - role: jitsi-install + - role: jitsi-add-logo + - role: jitsi-enable-prejoinPage + - role: jitsi-enable-fr-ln + - role: jitsi-enable-auth + tags: + - kk diff --git a/roles/jitsi-add-logo/files/logo-komki.svg b/roles/jitsi-add-logo/files/jitsi.komuniki.fr.svg similarity index 100% rename from roles/jitsi-add-logo/files/logo-komki.svg rename to roles/jitsi-add-logo/files/jitsi.komuniki.fr.svg diff --git a/roles/jitsi-add-logo/files/kaliop.komuniki.fr.svg b/roles/jitsi-add-logo/files/kaliop.komuniki.fr.svg new file mode 100644 index 0000000..863bd96 --- /dev/null +++ b/roles/jitsi-add-logo/files/kaliop.komuniki.fr.svg @@ -0,0 +1,259 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/roles/jitsi-add-logo/files/logo_Nereide_monochrome-blanc.svg b/roles/jitsi-add-logo/files/logo_Nereide_monochrome-blanc.svg deleted file mode 100644 index 9e04ec1..0000000 --- a/roles/jitsi-add-logo/files/logo_Nereide_monochrome-blanc.svg +++ /dev/null @@ -1,276 +0,0 @@ - - - - - - - - - - - - - - diff --git a/roles/jitsi-add-logo/files/IMIO_LOGO.svg b/roles/jitsi-add-logo/files/visio.imio.be.svg similarity index 100% rename from roles/jitsi-add-logo/files/IMIO_LOGO.svg rename to roles/jitsi-add-logo/files/visio.imio.be.svg diff --git a/roles/jitsi-enable-auth/tasks/main.yml b/roles/jitsi-enable-auth/tasks/main.yml index a68ace4..dcda8dc 100644 --- a/roles/jitsi-enable-auth/tasks/main.yml +++ b/roles/jitsi-enable-auth/tasks/main.yml @@ -3,7 +3,7 @@ replace: path: /etc/prosody/conf.d/{{ inventory_hostname }}.cfg.lua regexp: 'authentication = "anonymous"' - replace: 'authentication = "internal_plain"' + replace: 'authentication = "internal_hashed"' notify: - restart prosody - restart jitsi-videobridge2