From 7e05bc4be0171ce13eeb27faf70beb5c90fcc27e Mon Sep 17 00:00:00 2001 From: Antoine Ouvrard Date: Mon, 24 Aug 2020 17:21:59 +0200 Subject: déplacement de l'execution du lets encrypt dans le role d'install car ca n'arrivera pas d'utiliser jitsi sans certificat SSL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/jitsi-add-logo/files/logo-komki.svg | 135 +++++++++++++++++++++ roles/jitsi-add-logo/tasks/main.yml | 12 +- roles/jitsi-enable-LE/tasks/main.yml | 11 -- roles/jitsi-enable-calendar/tasks/main.yml | 9 ++ roles/jitsi-enable-fr-ln/tasks/main.yml | 6 - roles/jitsi-enable-prejoinPage/tasks/main.yml | 6 + roles/jitsi-enable-stats/tasks/main.yml | 12 +- .../templates/telegraf-general.conf.j2 | 32 +++-- roles/jitsi-install/tasks/main.yml | 13 ++ roles/jitsi-pre-install/tasks/main.yml | 17 ++- 10 files changed, 212 insertions(+), 41 deletions(-) create mode 100644 roles/jitsi-add-logo/files/logo-komki.svg delete mode 100644 roles/jitsi-enable-LE/tasks/main.yml create mode 100644 roles/jitsi-enable-calendar/tasks/main.yml create mode 100644 roles/jitsi-enable-prejoinPage/tasks/main.yml (limited to 'roles') 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 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + 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,10 +1,4 @@ --- -- 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 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 -- cgit v1.2.3