diff --git a/files/bbb.entrouvert.com/bbb-sounds/16000/conf-pin.wav b/files/bbb.entrouvert.com/bbb-sounds/16000/conf-pin.wav new file mode 100644 index 0000000..f610cf9 Binary files /dev/null and b/files/bbb.entrouvert.com/bbb-sounds/16000/conf-pin.wav differ diff --git a/files/bbb.entrouvert.com/bbb-sounds/32000/conf-pin.wav b/files/bbb.entrouvert.com/bbb-sounds/32000/conf-pin.wav new file mode 100644 index 0000000..88698aa Binary files /dev/null and b/files/bbb.entrouvert.com/bbb-sounds/32000/conf-pin.wav differ diff --git a/files/bbb.entrouvert.com/bbb-sounds/48000/conf-pin.wav b/files/bbb.entrouvert.com/bbb-sounds/48000/conf-pin.wav new file mode 100644 index 0000000..cc8355d Binary files /dev/null and b/files/bbb.entrouvert.com/bbb-sounds/48000/conf-pin.wav differ diff --git a/files/bbb.entrouvert.com/bbb-sounds/8000/conf-pin.wav b/files/bbb.entrouvert.com/bbb-sounds/8000/conf-pin.wav new file mode 100644 index 0000000..410d7bd Binary files /dev/null and b/files/bbb.entrouvert.com/bbb-sounds/8000/conf-pin.wav differ diff --git a/files/bbb.komuniki.fr/bbb-sounds/16000/conf-pin.wav b/files/bbb.komuniki.fr/bbb-sounds/16000/conf-pin.wav new file mode 100644 index 0000000..f4f14c3 Binary files /dev/null and b/files/bbb.komuniki.fr/bbb-sounds/16000/conf-pin.wav differ diff --git a/files/bbb.komuniki.fr/bbb-sounds/32000/conf-pin.wav b/files/bbb.komuniki.fr/bbb-sounds/32000/conf-pin.wav new file mode 100644 index 0000000..71a5d68 Binary files /dev/null and b/files/bbb.komuniki.fr/bbb-sounds/32000/conf-pin.wav differ diff --git a/files/bbb.komuniki.fr/bbb-sounds/48000/conf-pin.wav b/files/bbb.komuniki.fr/bbb-sounds/48000/conf-pin.wav new file mode 100644 index 0000000..1357712 Binary files /dev/null and b/files/bbb.komuniki.fr/bbb-sounds/48000/conf-pin.wav differ diff --git a/files/bbb.komuniki.fr/bbb-sounds/8000/conf-pin.wav b/files/bbb.komuniki.fr/bbb-sounds/8000/conf-pin.wav new file mode 100644 index 0000000..9d89139 Binary files /dev/null and b/files/bbb.komuniki.fr/bbb-sounds/8000/conf-pin.wav differ diff --git a/group_vars/all/vault b/group_vars/all/vault index 2afa306..c834b83 100644 --- a/group_vars/all/vault +++ b/group_vars/all/vault @@ -1,24 +1,30 @@ $ANSIBLE_VAULT;1.1;AES256 -62383664313030336230613936653439373863643231333139336331356237613831343333613163 -3137653661393266363133313965653834383266616531320a363130313239666461326334386331 -64613937353366643338376666633634326234393662336335666338626536626330366465366439 -3331626161386439380a336638336631363233383031346561393166666530356438366639333236 -35323565323166613337623435633135323333366561396235666435326661316464393433356266 -32653839316538373336663430373762656262663764363738613539633562306530323466373335 -37396465313766323235396338386362373765326432663362653733646339646261616466396164 -30353736663130333937346339303361663232643430666561376237316461383466363037653264 -62316161386539343738636162366638636261633866336136616132646365303563623131396336 -66396165623430343038386537613865316465363361633464383236393864663836323038653936 -65383965613861323337373438363431623665613563373764393336306431616566376437373664 -37303234326439393333656266356338346632363632643331363839353364633130333834613134 -33643164373231343765666239386439386139396166373061646431396439666632363564373034 -65383137356331363037346261613433396637643137383362653334633037656361626630343766 -66333030363062313365646366663034646331306563336262386266653431303064373734613231 -32656163363131626538333434376535303631613463636563313930323736356536623166366437 -32306538643638613565353265653761663431346334633339663939356264383630336535336335 -38323830646133363933633134323265353664356164636434353838363639633430383633653839 -39316333646130313863373163643239353264336565343430613731333665633566313934336261 -32316536303138316330326133363064376638336630363365343038633762356461326538633764 -39663264393437393630613665643865356337626537626531303763323634613036623630363935 -61386366323835663032383864373136653331373434653931316431303262323831313335613439 -333464616666376634383765393465616133 +61333538356632383839336135343862353764643963663538313239376562666665613137353333 +3138326361613439353838396162653263383839376234390a643963343962313935373134313465 +66656662386135353434313935636135336336323833626666383931623665366264663438663134 +6237656662356632350a313232376331393031366330336363613963343366393338323366313338 +34626231356530646163623738356462646463646261383735633166316133653631613466323161 +65323438316165646263343566303336663261616333636231336632653662383935626165643331 +65643839303730313134643866313963613532623635653735643433396530653035336161393930 +33626338306561333461383036356235666130313635643864343831363237613066613138326633 +32343761663533323635363034666165393063653438336533333232663237316431333863336165 +34306565623337316433653531383731343366626666616233633630363736333234316565313436 +30616331626365656333646262633130336166353137333139303764363165346133393836626233 +64323962666263303263343535396266623966356439653833313139653838363866626365366434 +66633461636637373264633130313438383461613835646463663061653531306362633737376562 +61376536633162303337336266386465353139306265386365316434346462653464366663316663 +66323335393361613432313430653865356137663261643037303663663535346366383366626339 +36356332373631393464623566303832666638356134643738646138396631353434343436623036 +30313137656363303939613734646463333039343838303162333165613432393634356432386538 +34613566623436303632666566306462626438663739353432663265653237633661396132376331 +31636637333132396464353036313362623234386435366661656134336436373030623830643038 +38643862306332663831363935326361316661333737616230633961393261643261653364373731 +65336433656362663961636666326430363432353537316164643662343634306538376165666639 +65616135643438353738376665613561353663356466306633653266303738323830346330386334 +61386537333935376134373134383666616564636565343261303161303064656436363064666432 +34653737616161386265623164336137363663653264643239326337383139336336643063313434 +33326166633263616537613365306335626562303835643637323162383831333234613136643464 +61646531646332393032366362383538616636656261373036373164323531393430363837393066 +37663865646338393866653636326131316237613030663964663962313366666136633634633731 +32626263316633306363313031626666316139393735616236653031626166383434646166353366 +63303163626335333735626338306332333037366239646631393138316364313932 diff --git a/host_vars/bbb.entrouvert.com.yml b/host_vars/bbb.entrouvert.com.yml new file mode 100644 index 0000000..4ed19a1 --- /dev/null +++ b/host_vars/bbb.entrouvert.com.yml @@ -0,0 +1,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 }}" \ No newline at end of file diff --git a/host_vars/bbb.komuniki.fr.yml b/host_vars/bbb.komuniki.fr.yml new file mode 100644 index 0000000..3dd9176 --- /dev/null +++ b/host_vars/bbb.komuniki.fr.yml @@ -0,0 +1,5 @@ +--- +bbb_sip_provider: sip5.ovh.fr +bbb_sip_telnum_for_user: 0972551042 +bbb_sip_username: 0033972551042 +bbb_sip_password: "{{ vault_bbb_sip_password }}" \ No newline at end of file diff --git a/host_vars/jitsi.komuniki.fr.yml b/host_vars/jitsi.komuniki.fr.yml index a65af55..ad00633 100644 --- a/host_vars/jitsi.komuniki.fr.yml +++ b/host_vars/jitsi.komuniki.fr.yml @@ -3,3 +3,6 @@ ansible_user: debian ansible_become: true jitsi_logo: jitsi.komuniki.fr.svg jitsi_logo_url: https://komuniki.fr +jigasi_sip_account: 0033972551042@sip5.ovh.fr +jigasi_sip_password: "{{ vault_jigasi_sip_password }}" +jigasi_sip_room: machineacafe \ No newline at end of file diff --git a/host_vars/publik.nereide.fr.yml b/host_vars/publik.nereide.fr.yml deleted file mode 100644 index 9997a2c..0000000 --- a/host_vars/publik.nereide.fr.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -ansible_user: root -jitsi_user: agent -jitsi_pass: publikvisio! -jitsi_logo: publik.nereide.fr.svg -jitsi_logo_url: https://www.hautes-alpes.fr/ diff --git a/inventory_prod b/inventory_prod index 72f8291..b4e56b8 100644 --- a/inventory_prod +++ b/inventory_prod @@ -2,5 +2,5 @@ jitsi.komuniki.fr visio.imio.be ansible_user=debian ansible_become=true jitsi.entrouvert.com ansible_user=root bbb.komuniki.fr ansible_user=root -xlbbb.komuniki.fr ansible_user=root bbbHostname=bbb.entrouvert.com +bbb.entrouvert.com ansible_user=root bbbHostname=bbb.entrouvert.com imio.bbb.komuniki.fr ansible_user=root bbbHostname=imio.bbb.komuniki.fr diff --git a/inventory_staging b/inventory_staging index 28bf5a1..88de3be 100644 --- a/inventory_staging +++ b/inventory_staging @@ -1,2 +1 @@ pp.jitsi.komuniki.fr -publik.nereide.fr diff --git a/playbook_prod.yml b/playbook_prod.yml index a61a741..7416129 100644 --- a/playbook_prod.yml +++ b/playbook_prod.yml @@ -34,15 +34,18 @@ roles: - role: bbb-enable-ldap-LE - role: bbb-enable-metrics + - role: bbb-disable-test-echo + - role: bbb-enable-sip tags: - - bbb + - komki.bbb -- hosts: xlbbb.komuniki.fr +- hosts: bbb.entrouvert.com roles: - role: bbb-set-hostname - role: bbb-disable-test-echo - role: bbb-enable-ldap-LE - role: bbb-enable-metrics + - role: bbb-enable-sip tags: - eo.bbb diff --git a/playbook_staging.yml b/playbook_staging.yml index 4f85b78..a7bbf82 100644 --- a/playbook_staging.yml +++ b/playbook_staging.yml @@ -12,13 +12,3 @@ tags: - ppkomki -- hosts: publik.nereide.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: - - pk diff --git a/roles/bbb-enable-sip/files/bbb_sip_ovh.xml b/roles/bbb-enable-sip/files/bbb_sip_ovh.xml new file mode 100644 index 0000000..a43b1a9 --- /dev/null +++ b/roles/bbb-enable-sip/files/bbb_sip_ovh.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/roles/bbb-enable-sip/handlers/main.yml b/roles/bbb-enable-sip/handlers/main.yml new file mode 100644 index 0000000..254cf59 --- /dev/null +++ b/roles/bbb-enable-sip/handlers/main.yml @@ -0,0 +1,8 @@ +--- +- name: restart freeswitch + systemd: + name: freeswitch + state: restarted + daemon_reload: true + enabled: true + diff --git a/roles/bbb-enable-sip/tasks/main.yml b/roles/bbb-enable-sip/tasks/main.yml new file mode 100644 index 0000000..9ddecd4 --- /dev/null +++ b/roles/bbb-enable-sip/tasks/main.yml @@ -0,0 +1,51 @@ +--- +- name: Application de la conf général SIP + template: + src: ../templates/sip-profiles.xml.j2 + dest: /opt/freeswitch/conf/sip_profiles/external/sip.xml + mode: u=rw,g=r,o=r + owner: freeswitch + group: daemon + notify: + - restart freeswitch + +- name: Application de la conf SIP + template: + src: ../files/bbb_sip_ovh.xml + dest: /opt/freeswitch/conf/dialplan/public/bbb_sip_ovh.xml + mode: u=rw,g=r,o=r + owner: freeswitch + group: daemon + notify: + - restart freeswitch + +- name: Ajout d'un message d'information dans le chat + lineinfile: + path: /usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties + regexp: "defaultDialAccessNumber=" + line: "defaultDialAccessNumber={{ bbb_sip_telnum_for_user }}" + +- name: Ajout d'un message d'information dans le chat + lineinfile: + path: /usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties + regexp: "defaultWelcomeMessageFooter=" + line: "defaultWelcomeMessageFooter=Pour rejoindre la conférence par téléphone, appeler au numéro :
%%DIALNUM%%
puis saisir le code :
%%CONFNUM%%" + register: welcomeMessage + +- name: On redémarre bbb que si le fichier ci dessus a été modifié + shell: "bbb-conf --restart" + when: welcomeMessage is changed + +- name: Changement du message d'accueil audio + copy: + src: "{{ inventory_hostname }}/bbb-sounds/{{ item }}/conf-pin.wav" + dest: "/opt/freeswitch/share/freeswitch/sounds/en/us/callie/conference/{{ item }}/" + owner: freeswitch + group: daemon + mode: u=rw,g=r,o=r + backup: yes + loop: + - 8000 + - 16000 + - 32000 + - 48000 \ No newline at end of file diff --git a/roles/bbb-enable-sip/templates/sip-profiles.xml.j2 b/roles/bbb-enable-sip/templates/sip-profiles.xml.j2 new file mode 100644 index 0000000..43191fe --- /dev/null +++ b/roles/bbb-enable-sip/templates/sip-profiles.xml.j2 @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/roles/jitsi-add-sip/tasks/main.yml b/roles/jitsi-add-sip/tasks/main.yml new file mode 100644 index 0000000..b8c0db7 --- /dev/null +++ b/roles/jitsi-add-sip/tasks/main.yml @@ -0,0 +1,25 @@ +--- +- name: Ajout du compte SIP + debconf: + name: jigasi + question: jigasi/sip-account + value: '{{ jigasi_sip_account }}' + vtype: string + +- name: Ajout du mot de passe SIP + debconf: + name: jigasi + question: jigasi/sip-password + value: '{{ jigasi_sip_password }}' + vtype: string + +- name: Installation de jigasi + apt: + name: + - jigasi + +- name: Nommage de la room SIP + lineinfile: + path: /etc/jitsi/jigasi/sip-communicator.properties + regexp: "org.jitsi.jigasi.DEFAULT_JVB_ROOM_NAME=" + line: "org.jitsi.jigasi.DEFAULT_JVB_ROOM_NAME={{ jigasi_sip_room }}@conference.{{ inventory_hostname }}"