diff options
| author | Antoine Ouvrard <antoine.ouvrard@nereide.fr> | 2021-03-18 21:46:26 +0000 |
|---|---|---|
| committer | Antoine Ouvrard <antoine.ouvrard@nereide.fr> | 2021-03-18 21:46:26 +0000 |
| commit | 1dd3f5b7593fa25b812927ff87a3c3e5c5e25f6d (patch) | |
| tree | 461b14c98533074461729a11cd82d2e015cb690f /roles | |
| parent | b2fa0ad1ba62ba0269d1ac1ebf8ac056b532a2b7 (diff) | |
| parent | 81c28914f8dbc78ebbdf328097ae338380b934cc (diff) | |
Merge branch '4-parametrage-multi-domaine' into 'master'
Resolve "migration Jitsi IMIO"
Closes #4 et #9
See merge request 10031/visio!6
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/jitsi-enable-multidomain/handlers/main.yml | 12 | ||||
| -rw-r--r-- | roles/jitsi-enable-multidomain/tasks/jitsi.yml | 9 | ||||
| -rw-r--r-- | roles/jitsi-enable-multidomain/tasks/main.yml | 7 | ||||
| -rw-r--r-- | roles/jitsi-enable-multidomain/tasks/nginx.yml | 39 | ||||
| -rw-r--r-- | roles/jitsi-enable-multidomain/tasks/ssl.yml | 43 | ||||
| -rw-r--r-- | roles/jitsi-enable-specific-imio/handlers/main.yml | 5 | ||||
| -rw-r--r-- | roles/jitsi-enable-specific-imio/tasks/main.yml | 66 | ||||
| -rw-r--r-- | roles/jitsi-install/tasks/main.yml | 2 |
8 files changed, 182 insertions, 1 deletions
diff --git a/roles/jitsi-enable-multidomain/handlers/main.yml b/roles/jitsi-enable-multidomain/handlers/main.yml new file mode 100644 index 0000000..d11edb3 --- /dev/null +++ b/roles/jitsi-enable-multidomain/handlers/main.yml @@ -0,0 +1,12 @@ +--- +- name: restart jitsi-videobridge2 + systemd: + name: jitsi-videobridge2 + state: restarted + enabled: true + +- name: restart nginx + systemd: + name: nginx + state: restarted + enabled: true diff --git a/roles/jitsi-enable-multidomain/tasks/jitsi.yml b/roles/jitsi-enable-multidomain/tasks/jitsi.yml new file mode 100644 index 0000000..2646dcd --- /dev/null +++ b/roles/jitsi-enable-multidomain/tasks/jitsi.yml @@ -0,0 +1,9 @@ +--- +- name: Conf Jitsi MultiDomain - rend l'url bosh dynamique dans la conf js + replace: + path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js + regexp: '[^?]{{ inventory_hostname }}/http-bind' + replace: '<!--# echo var="http_host" -->/<!--# echo var="subdir" default="" -->http-bind' + notify: + - restart jitsi-videobridge2 + - restart nginx
\ No newline at end of file diff --git a/roles/jitsi-enable-multidomain/tasks/main.yml b/roles/jitsi-enable-multidomain/tasks/main.yml new file mode 100644 index 0000000..c873437 --- /dev/null +++ b/roles/jitsi-enable-multidomain/tasks/main.yml @@ -0,0 +1,7 @@ +--- +- include_tasks: nginx.yml + loop: "{{ jitsi_multidomain_domain }}" + loop_control: + loop_var: hostname +- include_tasks: ssl.yml +- include_tasks: jitsi.yml
\ No newline at end of file diff --git a/roles/jitsi-enable-multidomain/tasks/nginx.yml b/roles/jitsi-enable-multidomain/tasks/nginx.yml new file mode 100644 index 0000000..8a3b6b9 --- /dev/null +++ b/roles/jitsi-enable-multidomain/tasks/nginx.yml @@ -0,0 +1,39 @@ +--- +- name: Check that the somefile.conf exists + stat: + path: /etc/nginx/sites-available/{{ hostname }}.conf + register: nginx_file + +- name: Conf Jitsi MultiDomain - Duplication de la conf nginx + copy: + src: /etc/nginx/sites-available/{{ inventory_hostname }}.conf + dest: /etc/nginx/sites-available/{{ hostname }}.conf + remote_src: yes + when: not nginx_file.stat.exists + +- name: Conf Jitsi MultiDomain - Change le ServerName des conf nginx + replace: + path: /etc/nginx/sites-available/{{ hostname }}.conf + regexp: "[^?]server_name {{ inventory_hostname }}" + replace: "server_name {{ hostname }}" + +- name: Conf Jitsi MultiDomain - surcharge le header proxy + replace: + path: /etc/nginx/sites-available/{{ hostname }}.conf + regexp: '[^?]\$http_host' + replace: ' {{ inventory_hostname }}' + +- name: Conf Jitsi MultiDomain - suppression du paramètre server_names_hash_bucket_size car génère une erreur si en doublon + lineinfile: + path: /etc/nginx/sites-available/{{ hostname }}.conf + state: absent + regexp: '^server_names_hash_bucket_size' + +- name: Activation des nouvelles conf nginx + file: + src: /etc/nginx/sites-available/{{ hostname }}.conf + dest: /etc/nginx/sites-enabled/{{ hostname }}.conf + state: link + notify: + - restart jitsi-videobridge2 + - restart nginx
\ No newline at end of file diff --git a/roles/jitsi-enable-multidomain/tasks/ssl.yml b/roles/jitsi-enable-multidomain/tasks/ssl.yml new file mode 100644 index 0000000..f9b8d28 --- /dev/null +++ b/roles/jitsi-enable-multidomain/tasks/ssl.yml @@ -0,0 +1,43 @@ +--- +- name: Check that the somefile.conf exists + stat: + path: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert-with-param.sh + register: ssl_file + +- name: Conf SSL MultiDomain - Duplication du script Let's Encrypt d'origine + copy: + src: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh + dest: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert-with-param.sh + mode: u+x + remote_src: yes + when: not ssl_file.stat.exists + +- name: Conf SSL MultiDomain - rend le nom de domaine paramétrable dans le script certbot de jitsi + replace: + path: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert-with-param.sh + regexp: '^DOMAIN="\${DEB_CONF_RESULT##\*:}"' + replace: "DOMAIN=$1" + +- name: Conf SSL MultiDomain - Exécution du script lets encrypt + shell: + cmd: "/usr/share/jitsi-meet/scripts/install-letsencrypt-cert-with-param.sh {{ item }}" + creates: /etc/letsencrypt/live/{{ item }}/fullchain.pem # Execute le script que si ce fichier n'existe pas + loop: "{{ jitsi_multidomain_domain }}" + +- name: Conf Jitsi MultiDomain - Change le ServerName des conf nginx + replace: + path: /etc/nginx/sites-available/{{ item }}.conf + regexp: "[^?]ssl_certificate /etc/letsencrypt/live/{{ inventory_hostname }}.*$" + replace: "ssl_certificate /etc/letsencrypt/live/{{ item }}/fullchain.pem;" + loop: "{{ jitsi_multidomain_domain }}" + notify: + - restart nginx + +- name: Conf Jitsi MultiDomain - Change le ServerName des conf nginx + replace: + path: /etc/nginx/sites-available/{{ item }}.conf + regexp: "[^?]ssl_certificate_key /etc/letsencrypt/live/{{ inventory_hostname }}.*$" + replace: "ssl_certificate_key /etc/letsencrypt/live/{{ item }}/privkey.pem;" + loop: "{{ jitsi_multidomain_domain }}" + notify: + - restart nginx diff --git a/roles/jitsi-enable-specific-imio/handlers/main.yml b/roles/jitsi-enable-specific-imio/handlers/main.yml new file mode 100644 index 0000000..a7e57e5 --- /dev/null +++ b/roles/jitsi-enable-specific-imio/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: reload nginx + systemd: + name: nginx + state: reloaded
\ No newline at end of file diff --git a/roles/jitsi-enable-specific-imio/tasks/main.yml b/roles/jitsi-enable-specific-imio/tasks/main.yml new file mode 100644 index 0000000..9473861 --- /dev/null +++ b/roles/jitsi-enable-specific-imio/tasks/main.yml @@ -0,0 +1,66 @@ +--- +- name: création du répertoire pour recevoir les fichiers statiques de IMIO + file: + path: /usr/share/jitsi-meet/static-imio + state: directory + +- name: personnalise la config nginx de l'accès jitsi principal + blockinfile: + path: /etc/nginx/sites-enabled/{{ inventory_hostname }}.conf + marker: "# {mark} ANSIBLE MANAGED BLOCK" + insertafter: "gzip_min_length 512;" + block: | + ### Pages static + location = /rgpd { + try_files /static-imio/imio-rgpd.html =404; + } + + location ~ ^/$ { + try_files /static-imio/imio-index.html =404; + } + + location ~ ^/static-imio/(.*)$ { + alias /usr/share/jitsi-meet/static-imio/$1; + } + notify: + - reload nginx + +- name: personnalise la config nginx de l'accès à cpas + blockinfile: + path: /etc/nginx/sites-enabled/{{ jitsi_multidomain_domain[0] }}.conf + marker: "# {mark} ANSIBLE MANAGED BLOCK" + insertafter: "gzip_min_length 512;" + block: | + #### Pages static + location = /cpas { + try_files /static-imio/cpas-cpas.html =404; + } + + location = /rgpd { + try_files /static-imio/cpas-rgpd.html =404; + } + + location ~ ^/$ { + try_files /static-imio/cpas-index.html =404; + } + + location ~ ^/static-imio/(.*)$ { + alias /usr/share/jitsi-meet/static-imio/$1; + } + notify: + - reload nginx + +- name: gestion du cookie la config nginx + blockinfile: + path: /etc/nginx/sites-enabled/{{ item }}.conf + marker: "# {mark} ANSIBLE MANAGED COOKIE BLOCK" + insertbefore: 'try_files \$uri @root_path' + block: | + # Ajout du cookie + set $room $1; + if ($http_cookie !~* "rgpd") { + return 302 $scheme://$host/rgpd?room=$room; + } + loop: "{{ jitsi_multidomain_domain }}" + notify: + - reload nginx
\ No newline at end of file diff --git a/roles/jitsi-install/tasks/main.yml b/roles/jitsi-install/tasks/main.yml index 7cafa77..ddc9b15 100644 --- a/roles/jitsi-install/tasks/main.yml +++ b/roles/jitsi-install/tasks/main.yml @@ -12,7 +12,7 @@ EMAIL=supervision@nereide.fr - name: Exécution du script lets encrypt - shell: + shell: cmd: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh >> jitsi-le.log creates: /etc/letsencrypt/live/{{ inventory_hostname }}/fullchain.pem # Execute le script que si ce fichier n'existe pas |
