diff options
| author | Antoine Ouvrard <antoine.ouvrard@nereide.fr> | 2020-08-24 17:21:59 +0200 |
|---|---|---|
| committer | Antoine Ouvrard <antoine.ouvrard@nereide.fr> | 2020-08-24 17:21:59 +0200 |
| commit | 7e05bc4be0171ce13eeb27faf70beb5c90fcc27e (patch) | |
| tree | a68dec2464b5d4d9a3f53a6046cc1d83c0a78fe4 /roles | |
| parent | 06e5b578b19626c0cfc79712ba66c65b49d4f1b6 (diff) | |
déplacement de l'execution du lets encrypt dans le role d'install car ca n'arrivera pas d'utiliser jitsi sans certificat SSL
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/jitsi-add-logo/files/logo-komki.svg | 135 | ||||
| -rw-r--r-- | roles/jitsi-add-logo/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/jitsi-enable-LE/tasks/main.yml | 11 | ||||
| -rw-r--r-- | roles/jitsi-enable-calendar/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/jitsi-enable-fr-ln/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/jitsi-enable-prejoinPage/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/jitsi-enable-stats/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/jitsi-enable-stats/templates/telegraf-general.conf.j2 | 32 | ||||
| -rw-r--r-- | roles/jitsi-install/tasks/main.yml | 13 | ||||
| -rw-r--r-- | roles/jitsi-pre-install/tasks/main.yml | 17 |
10 files changed, 212 insertions, 41 deletions
diff --git a/roles/jitsi-add-logo/files/logo-komki.svg b/roles/jitsi-add-logo/files/logo-komki.svg new file mode 100644 index 0000000..a5acade --- /dev/null +++ b/roles/jitsi-add-logo/files/logo-komki.svg @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="124.8466mm" + height="114.23556mm" + viewBox="0 0 124.8466 114.23556" + version="1.1" + id="svg8" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="logo-visio.svg"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.590625" + inkscape:cx="367.56452" + inkscape:cy="323.51278" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1853" + inkscape:window-height="1025" + inkscape:window-x="67" + inkscape:window-y="27" + inkscape:window-maximized="1" + showguides="false" + inkscape:guide-bbox="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + <sodipodi:guide + position="115.06012,195.22499" + orientation="1,0" + id="guide982" + inkscape:locked="false" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Calque 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-59.951922,-123.78641)"> + <path + style="fill:none;stroke:#000000;stroke-width:0.87112886;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 708.41864,110.70981 0.88815,-8.00777" + id="path945-3-1" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <g + id="g1403"> + <path + sodipodi:nodetypes="scccccssss" + inkscape:connector-curvature="0" + id="path2-4" + d="m 86.469777,153.32677 c -7.03899,0 -12.77855,5.73956 -12.77855,12.77855 0,47.5899 -0.0372,44.00704 -0.0372,69.57094 -0.0132,1.91436 2.16198,3.02418 3.70262,1.88774 l 21.78317,-16.0507 69.770423,0.22324 c 7.03894,0.0225 12.77803,-5.73903 12.77803,-12.77803 v -42.85319 c 0,-7.03899 -5.73905,-12.77855 -12.77803,-12.77855 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#807bff;fill-opacity:1;stroke:none;stroke-width:4.64664698;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + <path + sodipodi:nodetypes="scccccssss" + inkscape:connector-curvature="0" + id="path2-2-5" + d="m 80.119777,146.97677 c -7.03899,0 -12.77855,5.73956 -12.77855,12.77854 0,47.58991 -0.0372,44.00705 -0.0372,69.57094 -0.0132,1.91436 2.16198,3.02418 3.70262,1.88774 l 21.78317,-16.05069 69.770413,0.22324 c 7.03894,0.0225 12.77803,-5.73903 12.77803,-12.77803 v -42.8532 c 0,-7.03898 -5.73905,-12.77854 -12.77803,-12.77854 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.8;vector-effect:none;fill:#45ffac;fill-opacity:1;stroke:none;stroke-width:4.64664698;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + <g + id="g1004-8" + transform="translate(-4.8445766,118.65683)"> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.32291663;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" + d="m 112.2877,91.322831 h 48.91818 c 7.03894,0 12.77825,-5.739304 12.77825,-12.778294 v -42.8531 c 0,-7.03899 -5.73931,-12.77825 -12.77825,-12.77825 H 78.236247 c -7.038991,0 -12.77829,5.73926 -12.77829,12.77825 0,29.46775 0.491596,41.2963 0.491596,55.631394 v 13.939909 c -0.0132,1.91432 2.1622,3.02416 3.7028,1.88771 L 91.723954,90.887204 c 2.51762,-1.839237 2.517488,-1.839277 0,0" + id="path2-7-4" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssssscccccc" /> + </g> + <g + id="g1181-0" + transform="matrix(0.01547418,1.1956516,-1.1956516,0.01547418,-3.642961,-185.95034)" + style="stroke-width:1.10634732;stroke-miterlimit:4;stroke-dasharray:none"> + <path + style="fill:none;stroke:#000000;stroke-width:1.10634732;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 281.88247,-153.39664 1.32484,6.14029" + id="path1100-9-8" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path1102-9-4" + d="m 272.51203,-149.70665 3.26675,5.25591" + style="fill:none;stroke:#000000;stroke-width:1.10634732;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + inkscape:transform-center-y="-1.4559083" + inkscape:transform-center-x="-0.55996473" + inkscape:connector-curvature="0" + id="path1102-5-78-2" + d="m 265.42103,-142.39599 5.24153,3.28979" + style="fill:none;stroke:#000000;stroke-width:1.10634732;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + inkscape:transform-center-y="-1.5592883" + inkscape:transform-center-x="0.04300527" + inkscape:connector-curvature="0" + id="path1102-5-7-2-5" + d="m 261.33243,-132.80313 6.10359,1.02103" + style="fill:none;stroke:#000000;stroke-width:1.10634732;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> + <path + style="fill:#ffffff;stroke-width:0.64484543" + sodipodi:nodetypes="ccsscsccscccccccssssssssssss" + inkscape:connector-curvature="0" + id="path2-9" + d="m 117.6408,170.58258 c -0.39658,-0.26502 -1.06658,-0.28953 -1.48507,-0.0645 -0.41916,0.22495 -0.84217,0.66227 -0.84217,1.13752 v 15.47629 c 0,0.47526 0.42301,0.91244 0.8428,1.13749 0.19024,0.10192 0.48041,0.15209 0.6887,0.15209 0.2502,0 0.53973,-0.0728 0.75576,-0.21667 l 11.62721,-7.73814 c 0.35917,-0.23934 0.58422,-0.64162 0.58422,-1.07301 0,-0.4314 -0.2102,-0.8338 -0.56939,-1.07303 z m 0.25214,14.13954 v -10.65674 l 7.99285,5.32838 -2.30889,1.53919 z m 2.9018,11.4376 c -9.24515,0 -16.76599,-7.52081 -16.76599,-16.76596 0,-9.24514 7.52084,-16.76599 16.76599,-16.76599 9.24515,0 16.76597,7.52085 16.76597,16.76599 0,0.71191 0.57715,1.28967 1.2897,1.28967 0.71256,0 1.28969,-0.57776 1.28969,-1.28967 0,-10.66704 -8.67833,-19.34536 -19.34536,-19.34536 -10.66704,0 -19.34536,8.67832 -19.34536,19.34536 0,7.34432 4.11388,13.74593 10.15829,17.02141 2.7346,1.4819 5.86435,2.32395 9.18707,2.32395 0.71191,0 1.28968,-0.57713 1.28968,-1.2897 0,-0.71254 -0.57777,-1.2897 -1.28968,-1.2897 z" /> + </g> + </g> +</svg> diff --git a/roles/jitsi-add-logo/tasks/main.yml b/roles/jitsi-add-logo/tasks/main.yml index cf67141..ab152dd 100644 --- a/roles/jitsi-add-logo/tasks/main.yml +++ b/roles/jitsi-add-logo/tasks/main.yml @@ -3,12 +3,14 @@ template: src: ../files/{{ jitsi_logo }} dest: /usr/share/jitsi-meet/images/ + mode: u=rw,g=r,o=r -- name: Modif du css pour appliquer le nouveau logo - replace: - path: /usr/share/jitsi-meet/css/all.css - regexp: 'watermark.png' - replace: "{{ jitsi_logo }}" +- name: Application du logo si déclaré dans les variables + lineinfile: + path: /usr/share/jitsi-meet/interface_config.js + regexp: "DEFAULT_LOGO_URL: " + line: "DEFAULT_LOGO_URL: 'images/{{ jitsi_logo }}'," + when: jitsi_logo is defined - name: Application de l'url si déclaré dans les variables lineinfile: diff --git a/roles/jitsi-enable-LE/tasks/main.yml b/roles/jitsi-enable-LE/tasks/main.yml deleted file mode 100644 index 79f36b2..0000000 --- a/roles/jitsi-enable-LE/tasks/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Conf let's encrypt - désactivation de la demande du mail de supervision - replace: - path: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh - regexp: "^read EMAIL" - replace: | - #read EMAIL - EMAIL=supervision@nereide.fr - -- name: Exécution du script lets encrypt - shell: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh >> jitsi-le.log diff --git a/roles/jitsi-enable-calendar/tasks/main.yml b/roles/jitsi-enable-calendar/tasks/main.yml new file mode 100644 index 0000000..fcd9afa --- /dev/null +++ b/roles/jitsi-enable-calendar/tasks/main.yml @@ -0,0 +1,9 @@ +--- +- name: Conf Jitsi - Activation de la connexion au google calendar + blockinfile: + path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js + marker: "// {mark} ANSIBLE MANAGED BLOCK CALENDAR" + insertafter: "[^?]// enableCalendarIntegration: false," + block: | + enableCalendarIntegration: true, + googleApiApplicationClientID: "{{ vault_google_api_client_id }}", diff --git a/roles/jitsi-enable-fr-ln/tasks/main.yml b/roles/jitsi-enable-fr-ln/tasks/main.yml index d872eaf..200d7e3 100644 --- a/roles/jitsi-enable-fr-ln/tasks/main.yml +++ b/roles/jitsi-enable-fr-ln/tasks/main.yml @@ -1,12 +1,6 @@ --- - name: Conf Jitsi - UI en fr lineinfile: - path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js - insertafter: "[^?]// defaultLanguage: 'en'" - line: " defaultLanguage: 'fr'," - -- name: Conf Jitsi - UI en fr - lineinfile: path: /usr/share/jitsi-meet/interface_config.js regexp: "DEFAULT_LOCAL_DISPLAY_NAME: " line: "DEFAULT_LOCAL_DISPLAY_NAME: 'moi'," diff --git a/roles/jitsi-enable-prejoinPage/tasks/main.yml b/roles/jitsi-enable-prejoinPage/tasks/main.yml new file mode 100644 index 0000000..fbf1af8 --- /dev/null +++ b/roles/jitsi-enable-prejoinPage/tasks/main.yml @@ -0,0 +1,6 @@ +--- +- name: Conf Jitsi - Activation de la page de pré-connexion a la room + lineinfile: + path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js + insertafter: "[^?]// prejoinPageEnabled: false," + line: " prejoinPageEnabled: true," diff --git a/roles/jitsi-enable-stats/tasks/main.yml b/roles/jitsi-enable-stats/tasks/main.yml index ca36134..521b3e2 100644 --- a/roles/jitsi-enable-stats/tasks/main.yml +++ b/roles/jitsi-enable-stats/tasks/main.yml @@ -42,20 +42,14 @@ template: src: ../templates/telegraf-input-jitsi.conf dest: /etc/telegraf/telegraf.d/jitsi.conf + mode: u=rw,g=r,o=r notify: - restart telegraf -- name: Question - pause: - prompt: "Vers quel influxdb/grafana souhaitez vous envoyer les metrics?\n1- Néréide\n2- Champs-Libres\n" - register: prompt_input - - name: Application de la conf Telegraf - vars: - outputnrd: prompt_input.user_input == "1" - outputcl: prompt_input.user_input == "2" template: src: ../templates/telegraf-general.conf.j2 dest: /etc/telegraf/telegraf.conf + mode: u=rw,g=r,o=r notify: - - restart telegraf
\ No newline at end of file + - restart telegraf diff --git a/roles/jitsi-enable-stats/templates/telegraf-general.conf.j2 b/roles/jitsi-enable-stats/templates/telegraf-general.conf.j2 index b3ba4f0..7ab1275 100644 --- a/roles/jitsi-enable-stats/templates/telegraf-general.conf.j2 +++ b/roles/jitsi-enable-stats/templates/telegraf-general.conf.j2 @@ -21,11 +21,12 @@ ############################################################################### [[outputs.influxdb]] -{% if outputnrd %} urls = [ "https://influxdb.nereide.fr" ] username = "telegraf" password = "{{ vault_telegraf_nrd_passwd }}" -{% elif outputcl %} + +{% if "visio.imio.be" == inventory_hostname %} + [[outputs.influxdb]] urls = [ "https://influxdb.gra1.metrics.ovh.net" ] username = "metrics" password = "{{ vault_telegraf_cl_passwd }}" @@ -35,14 +36,27 @@ # INPUTS # ############################################################################### -[[inputs.processes]] [[inputs.cpu]] - percpu = false + percpu = true + totalcpu = true + fielddrop = ["time_*"] + [[inputs.disk]] - interval = "3600s" - ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"] - fielddrop = ["total","used","inodes_free","inodes_total","inodes_used"] + ignore_fs = ["tmpfs", "devtmpfs", "none", "iso9660", "overlay", "aufs", "squashfs"] + +[[inputs.diskio]] + +[[inputs.kernel]] + [[inputs.mem]] - fielddrop=["buffered","cached","slab","available_percent","used_percent","wired","commit_limit","commited_as","dirty","high_free","high_total","huge_page_size","huge_pages_free","huge_pages_total","low_free","low_total","mapped","page_tables","shared","sreclaimable","sunreclaim","swap_total","vmalloc_chunk","vmalloc_total","vmalloc_used","write_back","write_back_tmp"] + +[[inputs.swap]] + +[[inputs.net]] + fieldpass = [ "bytes*" ] + +[[inputs.netstat]] + +[[inputs.processes]] + [[inputs.system]] - fielddrop=["n_users","uptime_format","uptime","n_cpus"] diff --git a/roles/jitsi-install/tasks/main.yml b/roles/jitsi-install/tasks/main.yml index 1cd3548..5da2b98 100644 --- a/roles/jitsi-install/tasks/main.yml +++ b/roles/jitsi-install/tasks/main.yml @@ -2,3 +2,16 @@ - name: installation de jitsi apt: name: jitsi-meet + +- name: Conf let's encrypt - désactivation de la demande du mail de supervision + replace: + path: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh + regexp: "^read EMAIL" + replace: | + #read EMAIL + EMAIL=supervision@nereide.fr + +- name: Exécution du script lets encrypt + shell: + cmd: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh >> jitsi-le.log + removes: /etc/letsencrypt/live/jitsi.komuniki.fr/fullchain.pem diff --git a/roles/jitsi-pre-install/tasks/main.yml b/roles/jitsi-pre-install/tasks/main.yml index 73c113c..509e6be 100644 --- a/roles/jitsi-pre-install/tasks/main.yml +++ b/roles/jitsi-pre-install/tasks/main.yml @@ -1,11 +1,12 @@ --- -- name: Installation de fail2ban, nftables, gnupg2, apt-transport-https +- name: Installation de fail2ban, nftables, gnupg2, apt-transport-https, ufw apt: name: - fail2ban - nftables - gnupg2 - apt-transport-https + - ufw update_cache: true state: present @@ -36,6 +37,20 @@ - restart nftables - restart fail2ban +- name: Mise en place des règle firewall tcp et udp + #source : https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-quickstart#setup-and-configure-your-firewall + ufw: + state: enabled + rule: allow + port: '{{ item[0] }}' + proto: '{{ item[1] }}' + loop: + - ['80','tcp'] + - ['443','tcp'] + - ['4443','tcp'] + - ['22','tcp'] + - ['10000','udp'] + - name: Ajout de la clé GPG pour le depot jitsi apt_key: url: http://download.jitsi.org/jitsi-key.gpg.key |
