From 69197ee49184a43c4e47287d86715906dd7454da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 7 Apr 2020 16:02:09 +0200 Subject: [PATCH 1/6] adding stats to jitsi install --- inventory | 1 + roles/common/tasks/jitsi_install.yml | 8 ++++++++ roles/common/tasks/jitsi_stats.yml | 26 ++++++++++++++++++++++++++ roles/common/tasks/main.yml | 4 ++++ visio443.champs-libres.be.yml | 6 ++++++ 5 files changed, 45 insertions(+) create mode 100644 roles/common/tasks/jitsi_stats.yml create mode 100644 visio443.champs-libres.be.yml diff --git a/inventory b/inventory index 7514a91..9fa9c6f 100644 --- a/inventory +++ b/inventory @@ -4,3 +4,4 @@ visio2.nereide.fr visio.entrouvert.com visio443.champs-libres.be pp.visio.nereide.fr ansible_ssh_user=root jitsi_user=toto jitsi_pass=titi +visio443.champs-libres.be ansible_user=debian ansible_become=true ansible_python_interpreter=/usr/bin/python3 diff --git a/roles/common/tasks/jitsi_install.yml b/roles/common/tasks/jitsi_install.yml index e22c5ba..06c178f 100644 --- a/roles/common/tasks/jitsi_install.yml +++ b/roles/common/tasks/jitsi_install.yml @@ -1,4 +1,12 @@ --- +- name: installation de gpg si requis + apt: + name: + - gnupg2 + - apt-transport-https + update_cache: yes + state: present + - name: Ajout de la clé GPG pour le depot jitsi apt_key: url: https://download.jitsi.org/jitsi-key.gpg.key diff --git a/roles/common/tasks/jitsi_stats.yml b/roles/common/tasks/jitsi_stats.yml new file mode 100644 index 0000000..0c9ab6f --- /dev/null +++ b/roles/common/tasks/jitsi_stats.yml @@ -0,0 +1,26 @@ +--- +## activation des stats + +- name: configuration du videobridge pour activer les stats + lineinfile: + path: "/etc/jitsi/videobridge/sip-communicator.properties" + regexp: "^org.jitsi.videobridge.ENABLE_STATISTICS" + line: "org.jitsi.videobridge.ENABLE_STATISTICS=true" + +- name: configuration du videobridge pour transporter les stats via colibri REST api + lineinfile: + path: "/etc/jitsi/videobridge/sip-communicator.properties" + regexp: "^org.jitsi.videobridge.STATISTICS_TRANSPORT" + line: "org.jitsi.videobridge.STATISTICS_TRANSPORT=muc,colibri" + +- name: bloque l'accès à l'api colibri depuis l'extérieur + lineinfile: + path: "/etc/jitsi/videobridge/sip-communicator.properties" + regexp: "^org.jitsi.videobridge.rest.private.jetty.host" + line: "org.jitsi.videobridge.rest.private.jetty.host=localhost" + +- name: ajoute l'api REST à la config de démarrage du videobridge + lineinfile: + path: "/etc/jitsi/videobridge/config" + regexp: "^JVB_OPTS=" + line: 'JVB_OPTS=" --apis=rest,xmpp "' diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 37a9ed7..e9db997 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -2,3 +2,7 @@ - include_tasks: sys_conf.yml - include_tasks: jitsi_install.yml - include_tasks: jitsi_conf.yml +- include_tasks: jitsi_stats.yml + # for next commit :-) + # - include_tasks: jitsi_patching_coturn.yml + diff --git a/visio443.champs-libres.be.yml b/visio443.champs-libres.be.yml new file mode 100644 index 0000000..fe3e777 --- /dev/null +++ b/visio443.champs-libres.be.yml @@ -0,0 +1,6 @@ +- hosts: visio443.champs-libres.be + roles: + - role: common + vars: + hostname: visio443.champs-libres.be + From 7d77c2366ee56d6b32ccc7ad85a6c21fc92b6830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 8 Apr 2020 09:55:11 +0200 Subject: [PATCH 2/6] Apply suggestion to roles/common/tasks/jitsi_stats.yml --- roles/common/tasks/jitsi_stats.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/common/tasks/jitsi_stats.yml b/roles/common/tasks/jitsi_stats.yml index 0c9ab6f..f799c0b 100644 --- a/roles/common/tasks/jitsi_stats.yml +++ b/roles/common/tasks/jitsi_stats.yml @@ -6,7 +6,6 @@ path: "/etc/jitsi/videobridge/sip-communicator.properties" regexp: "^org.jitsi.videobridge.ENABLE_STATISTICS" line: "org.jitsi.videobridge.ENABLE_STATISTICS=true" - - name: configuration du videobridge pour transporter les stats via colibri REST api lineinfile: path: "/etc/jitsi/videobridge/sip-communicator.properties" From cca02db6c4b0e532480eec5df2e6e85afd31e743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 7 Apr 2020 16:02:09 +0200 Subject: [PATCH 3/6] adding stats to jitsi install --- inventory | 2 +- roles/common/tasks/jitsi_install.yml | 8 ++++++++ roles/common/tasks/jitsi_stats.yml | 26 ++++++++++++++++++++++++++ roles/common/tasks/main.yml | 4 ++++ visio443.champs-libres.be.yml | 6 ++++++ 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 roles/common/tasks/jitsi_stats.yml create mode 100644 visio443.champs-libres.be.yml diff --git a/inventory b/inventory index 7f0613c..fdcae40 100644 --- a/inventory +++ b/inventory @@ -2,4 +2,4 @@ visio.imio.be visio.nereide.fr visio2.nereide.fr ansible_ssh_user=root jitsi_user=nereide jitsi_pass=ofbiz visio.entrouvert.com -visio443.champs-libres.be +visio443.champs-libres.be ansible_user=debian ansible_become=true ansible_python_interpreter=/usr/bin/python3 diff --git a/roles/common/tasks/jitsi_install.yml b/roles/common/tasks/jitsi_install.yml index 8750cd7..2974527 100644 --- a/roles/common/tasks/jitsi_install.yml +++ b/roles/common/tasks/jitsi_install.yml @@ -1,4 +1,12 @@ --- +- name: installation de gpg si requis + apt: + name: + - gnupg2 + - apt-transport-https + update_cache: yes + state: present + - name: Ajout de la clé GPG pour le depot jitsi apt_key: url: http://download.jitsi.org/jitsi-key.gpg.key diff --git a/roles/common/tasks/jitsi_stats.yml b/roles/common/tasks/jitsi_stats.yml new file mode 100644 index 0000000..0c9ab6f --- /dev/null +++ b/roles/common/tasks/jitsi_stats.yml @@ -0,0 +1,26 @@ +--- +## activation des stats + +- name: configuration du videobridge pour activer les stats + lineinfile: + path: "/etc/jitsi/videobridge/sip-communicator.properties" + regexp: "^org.jitsi.videobridge.ENABLE_STATISTICS" + line: "org.jitsi.videobridge.ENABLE_STATISTICS=true" + +- name: configuration du videobridge pour transporter les stats via colibri REST api + lineinfile: + path: "/etc/jitsi/videobridge/sip-communicator.properties" + regexp: "^org.jitsi.videobridge.STATISTICS_TRANSPORT" + line: "org.jitsi.videobridge.STATISTICS_TRANSPORT=muc,colibri" + +- name: bloque l'accès à l'api colibri depuis l'extérieur + lineinfile: + path: "/etc/jitsi/videobridge/sip-communicator.properties" + regexp: "^org.jitsi.videobridge.rest.private.jetty.host" + line: "org.jitsi.videobridge.rest.private.jetty.host=localhost" + +- name: ajoute l'api REST à la config de démarrage du videobridge + lineinfile: + path: "/etc/jitsi/videobridge/config" + regexp: "^JVB_OPTS=" + line: 'JVB_OPTS=" --apis=rest,xmpp "' diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 37a9ed7..e9db997 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -2,3 +2,7 @@ - include_tasks: sys_conf.yml - include_tasks: jitsi_install.yml - include_tasks: jitsi_conf.yml +- include_tasks: jitsi_stats.yml + # for next commit :-) + # - include_tasks: jitsi_patching_coturn.yml + diff --git a/visio443.champs-libres.be.yml b/visio443.champs-libres.be.yml new file mode 100644 index 0000000..fe3e777 --- /dev/null +++ b/visio443.champs-libres.be.yml @@ -0,0 +1,6 @@ +- hosts: visio443.champs-libres.be + roles: + - role: common + vars: + hostname: visio443.champs-libres.be + From db4b720cd08eb34962a51232daa7c3f243aaef3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 8 Apr 2020 10:09:02 +0200 Subject: [PATCH 4/6] removve update_cache --- roles/common/tasks/jitsi_install.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/common/tasks/jitsi_install.yml b/roles/common/tasks/jitsi_install.yml index 2974527..5e319c2 100644 --- a/roles/common/tasks/jitsi_install.yml +++ b/roles/common/tasks/jitsi_install.yml @@ -1,10 +1,9 @@ --- - name: installation de gpg si requis apt: - name: + name: - gnupg2 - apt-transport-https - update_cache: yes state: present - name: Ajout de la clé GPG pour le depot jitsi From c6701e8fa1bb22c23869d1bcc01edb0f1088cdd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 8 Apr 2020 10:09:18 +0200 Subject: [PATCH 5/6] fix playbook for visio443 --- visio443.champs-libres.be.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/visio443.champs-libres.be.yml b/visio443.champs-libres.be.yml index fe3e777..cb479cd 100644 --- a/visio443.champs-libres.be.yml +++ b/visio443.champs-libres.be.yml @@ -1,6 +1,6 @@ +--- - hosts: visio443.champs-libres.be roles: - role: common vars: hostname: visio443.champs-libres.be - From 1ad02915f265535204d4753dc9d799e8c4b028ec Mon Sep 17 00:00:00 2001 From: Antoine Ouvrard Date: Wed, 8 Apr 2020 11:50:50 +0200 Subject: [PATCH 6/6] =?UTF-8?q?on=20fera=20la=20modif=20a=20la=20main=20en?= =?UTF-8?q?=20attendant=20l'int=C3=A9gration=20dans=20le=20d=C3=A9pot=20ji?= =?UTF-8?q?tsi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/common/tasks/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index e9db997..19598cf 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -3,6 +3,4 @@ - include_tasks: jitsi_install.yml - include_tasks: jitsi_conf.yml - include_tasks: jitsi_stats.yml - # for next commit :-) - # - include_tasks: jitsi_patching_coturn.yml