summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--host_vars/bbb.entrouvert.com.yml2
-rw-r--r--playbook_prod.yml1
-rw-r--r--roles/bbb-enable-external-coturn/tasks/main.yml10
-rw-r--r--roles/jibri-install/tasks/install-chromedriver.yml5
-rw-r--r--roles/jitsi-enable-jibri/tasks/main.yml6
-rw-r--r--roles/jitsi-enable-specific-komuniki/tasks/main.yml5
6 files changed, 12 insertions, 17 deletions
diff --git a/host_vars/bbb.entrouvert.com.yml b/host_vars/bbb.entrouvert.com.yml
index 7f92dab..1c5dc5f 100644
--- a/host_vars/bbb.entrouvert.com.yml
+++ b/host_vars/bbb.entrouvert.com.yml
@@ -3,3 +3,5 @@ bbb_sip_provider: sip5.ovh.fr
bbb_sip_telnum_for_user: 0972552599
bbb_sip_username: 0033972552599
bbb_sip_password: "{{ vault_bbb_EO_sip_password }}"
+coturn_hostname: origan.champs-libres.be
+coturn_secret: "{{ vault_coturn_secret }}"
diff --git a/playbook_prod.yml b/playbook_prod.yml
index 5404954..b9f6526 100644
--- a/playbook_prod.yml
+++ b/playbook_prod.yml
@@ -48,6 +48,7 @@
- role: bbb-enable-ldap-LE
- role: bbb-enable-metrics
- role: bbb-enable-sip
+ - role: bbb-enable-external-coturn
tags:
- eo.bbb
diff --git a/roles/bbb-enable-external-coturn/tasks/main.yml b/roles/bbb-enable-external-coturn/tasks/main.yml
index d182a71..fb0ec17 100644
--- a/roles/bbb-enable-external-coturn/tasks/main.yml
+++ b/roles/bbb-enable-external-coturn/tasks/main.yml
@@ -1,4 +1,5 @@
---
+# yamllint disable rule:line-length
- name: vérification des variables obligatoire
fail:
msg: |
@@ -11,7 +12,6 @@
blockinfile:
path: /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml
marker: "<!-- {mark} ANSIBLE MANAGED turn1 -->"
- # yamllint disable-line rule:line-length
insertbefore: ' <bean id="stunTurnService" class="org.bigbluebutton.web.services.turn.StunTurnService">'
block: |
<bean id="turn1" class="org.bigbluebutton.web.services.turn.TurnServer">
@@ -26,7 +26,6 @@
blockinfile:
path: /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml
marker: "<!-- {mark} ANSIBLE MANAGED turn2 -->"
- # yamllint disable-line rule:line-length
insertbefore: ' <bean id="stunTurnService" class="org.bigbluebutton.web.services.turn.StunTurnService">'
block: |
<bean id="turn2" class="org.bigbluebutton.web.services.turn.TurnServer">
@@ -40,9 +39,7 @@
- name: ajout du server stun
lineinfile:
path: /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml
- # yamllint disable-line rule:line-length
regexp: ' <constructor-arg index="0" value="stun:stun.freeswitch.org"/>'
- # yamllint disable-line rule:line-length
line: ' <constructor-arg index="0" value="stun:{{ coturn_hostname }}"/>'
notify:
- restart bigbluebutton
@@ -50,9 +47,7 @@
- name: activation du server turn
lineinfile:
path: /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml
- # yamllint disable-line rule:line-length
regexp: ' <!--ref bean="turn1" /-->'
- # yamllint disable-line rule:line-length
line: ' <ref bean="turn1" />'
notify:
- restart bigbluebutton
@@ -60,9 +55,8 @@
- name: activation du server turns
lineinfile:
path: /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml
- # yamllint disable-line rule:line-length
regexp: ' <!--ref bean="turn2" /-->'
- # yamllint disable-line rule:line-length
line: ' <ref bean="turn2" />'
notify:
- restart bigbluebutton
+# yamllint enable rule:line-length
diff --git a/roles/jibri-install/tasks/install-chromedriver.yml b/roles/jibri-install/tasks/install-chromedriver.yml
index 2e341e6..0699d2c 100644
--- a/roles/jibri-install/tasks/install-chromedriver.yml
+++ b/roles/jibri-install/tasks/install-chromedriver.yml
@@ -18,10 +18,11 @@
state: directory
path: /usr/local/bin/
mode: 0644
- - name: "télécharge de chromedriver pour la version
- {{ _latest_release.content }}"
+ # yamllint disable rule:line-length
+ - name: "télécharge de chromedriver pour la version {{ _latest_release.content }}"
unarchive:
src: "http://chromedriver.storage.googleapis.com/{{ _latest_release.content }}/chromedriver_linux64.zip"
+ # yamllint enable rule:line-length
dest: /usr/local/bin
mode: "755"
remote_src: true
diff --git a/roles/jitsi-enable-jibri/tasks/main.yml b/roles/jitsi-enable-jibri/tasks/main.yml
index ef67d0e..a01bf1d 100644
--- a/roles/jitsi-enable-jibri/tasks/main.yml
+++ b/roles/jitsi-enable-jibri/tasks/main.yml
@@ -1,4 +1,5 @@
---
+# yamllint disable rule:line-length
- name: vérification des variables obligatoire
fail:
msg: |
@@ -20,20 +21,16 @@
- restart prosody
- name: utilisateur jibri pour prosody (auth)
- # yamllint disable-line rule:line-length
command: prosodyctl register {{ item.user }} auth.{{ inventory_hostname }} {{ item.password }}
args:
# Prosody remplace les points par des '%2e' dans le chemin du fichier
- # yamllint disable-line rule:line-length
creates: /var/lib/prosody/{{ 'auth%2e'+inventory_hostname | replace('.', '%2e') }}/accounts/{{ item.user }}.dat
loop: "{{ jibri_users }}"
- name: utilisateur jibri pour prosody (recorder)
- # yamllint disable-line rule:line-length
command: prosodyctl register {{ item.user }}-record recorder.{{ inventory_hostname }} {{ item.password }}
args:
# Prosody remplace les points par des '%2e' dans le chemin du fichier
- # yamllint disable-line rule:line-length
creates: /var/lib/prosody/{{ 'auth%2e'+inventory_hostname | replace('.', '%2e') }}/accounts/{{ item.user }}.dat
loop: "{{ jibri_users }}"
@@ -60,3 +57,4 @@
path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js
insertbefore: "[^?]// List of undocumented"
line: "hiddenDomain: 'recorder.{{ inventory_hostname }}',"
+# yamllint enable rule:line-length
diff --git a/roles/jitsi-enable-specific-komuniki/tasks/main.yml b/roles/jitsi-enable-specific-komuniki/tasks/main.yml
index f112ffc..66905a0 100644
--- a/roles/jitsi-enable-specific-komuniki/tasks/main.yml
+++ b/roles/jitsi-enable-specific-komuniki/tasks/main.yml
@@ -1,4 +1,5 @@
---
+# yamllint disable rule:line-length
- name: copy des fichiers de personnalisation de la page d'accueil de jitsi
copy:
src: '../file/{{ item[0] }}'
@@ -22,9 +23,7 @@
line: '{{ item[1] }}'
loop:
- ['APP_NAME: ', " APP_NAME: 'Komuniki',"]
- # yamllint disable-line rule:line-length
- ['DEFAULT_LOGO_URL: ', " DEFAULT_LOGO_URL: 'images/logo-komuniki.svg',"]
- # yamllint disable-line rule:line-length
- ['DEFAULT_WELCOME_PAGE_LOGO_URL: ', " DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/logo-komuniki-txt.svg',"]
- # yamllint disable-line rule:line-length
- ['JITSI_WATERMARK_LINK: ', " JITSI_WATERMARK_LINK: 'https://komuniki.fr',"]
+# yamllint enable rule:line-length