diff --git a/group_vars/all/vault b/group_vars/all/vault index 2da7788..e18e86c 100644 --- a/group_vars/all/vault +++ b/group_vars/all/vault @@ -1,35 +1,41 @@ $ANSIBLE_VAULT;1.1;AES256 -33366637616337386438303331383830636131393062366539323333356531656638633362646633 -3836666230323933653534363330386531373964633261350a386164336165666539313433333233 -36363636633263303965396664393136323637323130646135366462623261656161333830666338 -3564353666616561390a663636663162313564666264336661376636643532643833386263383731 -66383564626134613365306262336337656430386263366633633134383730643163356138316664 -61663136633864396237306261346430316635643736346234353133653561373566383638623966 -31336333346138303564643866663563326237653134323834663633643330666263653232366665 -34313537373038363734353766346639636462313962323034623430306465623539396332643130 -62613030303234623865653832313662663764373432393366643262363136333662393439363730 -30343535366331323864653066323333393938366166343463626132636431353663386534633936 -39613163353236613133646464396337363637346336303231343766353134623036333333326337 -33333766656465353638326461613431316236653039376363613536363937666364623166663531 -36316533356464363530323666653436666331393634623539636130323237316663396239396564 -39396236653636643764643636383332336262303234353730376638366236396630666163663266 -35646662643236333630363566613436363737653461363839343131633632616230333737663535 -31353638666233376433303338316465323737353538623530636366353963633663333333346364 -66396562613337343034383137373838306636316334666239663964613134363962353138386663 -37313561386662383066633734653439333035653765393135353663623535656330343963323462 -61623837393131636466346364333734343064643838363836326562613731623730333030373431 -39633435366666333236323430353138663363383064343565316132353561353763326334376237 -66303963316632386464633865613339333133333939356665353165623762333565353837306631 -30393763366231613738386233636439663937393138363338373565613630666234343463353532 -36356531383737656164653935376331666261343239383462333966316335323531386365613138 -30353939366164633730363161393766623638303633396132333339396164666335343836376638 -32323066323631363436346339353838373866613837613666303264613535316134643661313165 -63643039356631376432316563613130376539623638343864303738393132353331623330663235 -66363032646233336566653233336133616561393831386162396631663930626430323766326137 -31643766666538396266626464313036666638326233313065393163393230653135313730633339 -64363338346564316461393963633363306365363034653037653766653930626564393433376536 -33613665346334643361613163623536336138393037333135636664323235326563363761663037 -35396666386433613063313639336239623637623263613762643835356261326236663338376564 -35613633303430333736333531616436656537323335636434316231336633633262343964663261 -37656438393831333730363761316334353265313239343030396534643066323665373862643832 -3862343563316335313338313532643466643330633164383265 +66646337313065366164343732383139666337356436363761323461343762396438356163363633 +3066353137613131306439356266386134393638366233340a636662623435653262386539373362 +32613361333836353062366535356466306138373364326431393765346436333331663764323861 +6233313665303465660a653363343561313634383537376161313033653763303039323264353836 +62303765343763303431326134643263363366626232633035323931343932653537333833386637 +38363633356535323561656463363364343366383338366333303865313434356135363935303037 +33633161316137633739363866363935343266313434333435653135316132303333393230313838 +30323931336437346462646539313061623832303961306564393332386633373766666264373538 +37373339666538383933373036666665373634636639373363386634373161633436373438663863 +64303162633533383066303263366265363366646263363035373132623539386334336665633238 +37653733656663653165333432393663663437333732626532333834393031643265376335313235 +65303139613032316263313736323330353565333865653332383131363331306132393062333262 +38373564363866333361313763303931353862333537623637313636613330336639333638353734 +34316665393763346665373239633235653138653731353564643238396436346563613737663034 +37303364633938333235646664643436323136353233663231323965656163376239396566386266 +63376335663961396532633531336538333065653833343065626336383136376539613966323762 +35656334323261393731323662346531386235396262346335646333316439303035623039376466 +36376536663966663032393632383462666363366237373965373038343334653131626235636632 +39666335346464636431356234306637313331623662366537393831653334633332313632366230 +36396464333462653665333836393863303531336430623539356465613834373938616436333630 +32336363396139656430383764366637656134373364306531373964623165343839316661366662 +33303066383039353164393866636464636264336334623061373338643762396461636262353935 +31333236656332353937633834336334656637343138653562326266653865326234376133343164 +63376465656134356366613635626333393030386634636438303938303365396331646262303162 +39613739666230623062653833383630626630643635373839626334376164633562393238373230 +65386435393032653036633361383865643031396664383030626662313162386238333130363634 +32393439303430383731326165653962623633643437326465386537366363643166666461323165 +62313266376163636165306630623337626566616364363063363566326533353432613137363331 +35613465393737336662306230616165376234616232313937336635356461396439383835306331 +38346436313634383937396365353438646134613462613535343363303462623235343431643539 +61653330396235303064643565303963663537313832346437656231643564663134303834366261 +37626638353962366537306432373961643736363761633134313163346664623030346462343432 +39633734323366363935323365393663666434353061393334633731373736623034316466316636 +36356236356662623665663037306138316565343833393665623862626435626537666262386165 +61666563303839376134623132636461623561386237373733353936303766663235383936643035 +30363065636236626565363162326631343134326465656239373465666139323038643565386666 +31386238623665363539643639636636313538613538653839623334643164643436386637636235 +38363339376633353837633134353062303532306564366162336661373130626336623138656562 +30326339663934323363336535363966333466353163303633633339636233346362373030393439 +34396666383061633534 diff --git a/host_vars/jibri1.imio.komuniki.fr.yml b/host_vars/jibri1.imio.komuniki.fr.yml new file mode 100644 index 0000000..8849b4e --- /dev/null +++ b/host_vars/jibri1.imio.komuniki.fr.yml @@ -0,0 +1,5 @@ +--- +jibri_user: "jibri2" +jibri_password: "{{ vault_jibri2_imio }}" +jitsi_server_host: "visio.imio.be" +jitsi_cookie_enabled: true diff --git a/host_vars/jibri2.imio.komuniki.fr.yml b/host_vars/jibri2.imio.komuniki.fr.yml new file mode 100644 index 0000000..565082c --- /dev/null +++ b/host_vars/jibri2.imio.komuniki.fr.yml @@ -0,0 +1,5 @@ +--- +jibri_user: "jibri1" +jibri_password: "{{ vault_jibri1_imio }}" +jitsi_server_host: "visio.imio.be" +jitsi_cookie_enabled: true diff --git a/host_vars/visio.imio.be.yml b/host_vars/visio.imio.be.yml index 6104906..dc94b36 100644 --- a/host_vars/visio.imio.be.yml +++ b/host_vars/visio.imio.be.yml @@ -4,3 +4,8 @@ jitsi_logo_url: https://imio.be jitsi_multidomain_domain: ['visio-cpas.be'] coturn_hostname: origan.champs-libres.be coturn_secret: "{{ vault_coturn_secret }}" +jibri_users: + - user: "jibri1" + password: "{{ vault_jibri1_imio }}" + - user: "jibri2" + password: "{{ vault_jibri2_imio }}" diff --git a/inventory_prod b/inventory_prod index b4e56b8..68f6891 100644 --- a/inventory_prod +++ b/inventory_prod @@ -4,3 +4,5 @@ jitsi.entrouvert.com ansible_user=root bbb.komuniki.fr ansible_user=root bbb.entrouvert.com ansible_user=root bbbHostname=bbb.entrouvert.com imio.bbb.komuniki.fr ansible_user=root bbbHostname=imio.bbb.komuniki.fr +jibri1.imio.komuniki.fr ansible_user=debian ansible_become=true +jibri2.imio.komuniki.fr ansible_user=debian ansible_become=true \ No newline at end of file diff --git a/playbook_prod.yml b/playbook_prod.yml index b9f6526..5e250e3 100644 --- a/playbook_prod.yml +++ b/playbook_prod.yml @@ -9,6 +9,7 @@ - role: jitsi-enable-external-coturn - role: jitsi-enable-multidomain - role: jitsi-enable-specific-imio + - role: jitsi-enable-jibri tags: - imio @@ -59,3 +60,15 @@ - role: bbb-enable-metrics tags: - imio.bbb + +- hosts: jibri1.imio.komuniki.fr + roles: + - role: jibri-install + tags: + - jibri1.imio + +- hosts: jibri2.imio.komuniki.fr + roles: + - role: jibri-install + tags: + - jibri2.imio diff --git a/roles/jibri-install/tasks/install-chromedriver.yml b/roles/jibri-install/tasks/install-chromedriver.yml index 0699d2c..ca00ef4 100644 --- a/roles/jibri-install/tasks/install-chromedriver.yml +++ b/roles/jibri-install/tasks/install-chromedriver.yml @@ -17,7 +17,7 @@ file: state: directory path: /usr/local/bin/ - mode: 0644 + mode: 0755 # yamllint disable rule:line-length - name: "télécharge de chromedriver pour la version {{ _latest_release.content }}" unarchive: diff --git a/roles/jibri-install/tasks/install-googlechrome.yml b/roles/jibri-install/tasks/install-googlechrome.yml index 5ab6898..c23873f 100644 --- a/roles/jibri-install/tasks/install-googlechrome.yml +++ b/roles/jibri-install/tasks/install-googlechrome.yml @@ -23,10 +23,10 @@ file: state: directory path: /etc/opt/chrome/policies/managed - mode: 0644 + mode: 0755 - name: CommandLineFlagSecurityWarningsEnabled copy: dest: /etc/opt/chrome/policies/managed/managed_policies.json - mode: 0755 + mode: 0644 content: | { "CommandLineFlagSecurityWarningsEnabled": false } diff --git a/roles/jitsi-enable-jibri/tasks/main.yml b/roles/jitsi-enable-jibri/tasks/main.yml index a01bf1d..77089d1 100644 --- a/roles/jitsi-enable-jibri/tasks/main.yml +++ b/roles/jitsi-enable-jibri/tasks/main.yml @@ -31,7 +31,7 @@ command: prosodyctl register {{ item.user }}-record recorder.{{ inventory_hostname }} {{ item.password }} args: # Prosody remplace les points par des '%2e' dans le chemin du fichier - creates: /var/lib/prosody/{{ 'auth%2e'+inventory_hostname | replace('.', '%2e') }}/accounts/{{ item.user }}.dat + creates: /var/lib/prosody/{{ 'recorder%2e'+inventory_hostname | replace('.', '%2e') }}/accounts/{{ item.user + '-record' | replace('-', '%2d') }}.dat loop: "{{ jibri_users }}" - name: authentification jicofo @@ -55,6 +55,6 @@ - name: hidden domain lineinfile: path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js - insertbefore: "[^?]// List of undocumented" + insertafter: "[^?]// subject: 'Conference Subject'," line: "hiddenDomain: 'recorder.{{ inventory_hostname }}'," # yamllint enable rule:line-length