From c53cfeda1223f6adc978be4f1bd0f381a0cc5b81 Mon Sep 17 00:00:00 2001 From: Antoine Ouvrard Date: Fri, 30 Apr 2021 19:46:14 +0200 Subject: lint --- roles/jitsi-enable-multidomain/tasks/jitsi.yml | 2 +- roles/jitsi-enable-multidomain/tasks/main.yml | 2 +- roles/jitsi-enable-multidomain/tasks/nginx.yml | 5 +++-- roles/jitsi-enable-multidomain/tasks/ssl.yml | 8 ++++---- 4 files changed, 9 insertions(+), 8 deletions(-) (limited to 'roles/jitsi-enable-multidomain') diff --git a/roles/jitsi-enable-multidomain/tasks/jitsi.yml b/roles/jitsi-enable-multidomain/tasks/jitsi.yml index 2646dcd..a3279aa 100644 --- a/roles/jitsi-enable-multidomain/tasks/jitsi.yml +++ b/roles/jitsi-enable-multidomain/tasks/jitsi.yml @@ -6,4 +6,4 @@ replace: '/http-bind' notify: - restart jitsi-videobridge2 - - restart nginx \ No newline at end of file + - restart nginx diff --git a/roles/jitsi-enable-multidomain/tasks/main.yml b/roles/jitsi-enable-multidomain/tasks/main.yml index c873437..5bbebdd 100644 --- a/roles/jitsi-enable-multidomain/tasks/main.yml +++ b/roles/jitsi-enable-multidomain/tasks/main.yml @@ -4,4 +4,4 @@ loop_control: loop_var: hostname - include_tasks: ssl.yml -- include_tasks: jitsi.yml \ No newline at end of file +- include_tasks: jitsi.yml diff --git a/roles/jitsi-enable-multidomain/tasks/nginx.yml b/roles/jitsi-enable-multidomain/tasks/nginx.yml index 8a3b6b9..f3fd694 100644 --- a/roles/jitsi-enable-multidomain/tasks/nginx.yml +++ b/roles/jitsi-enable-multidomain/tasks/nginx.yml @@ -8,7 +8,8 @@ copy: src: /etc/nginx/sites-available/{{ inventory_hostname }}.conf dest: /etc/nginx/sites-available/{{ hostname }}.conf - remote_src: yes + remote_src: true + mode: 0644 when: not nginx_file.stat.exists - name: Conf Jitsi MultiDomain - Change le ServerName des conf nginx @@ -36,4 +37,4 @@ state: link notify: - restart jitsi-videobridge2 - - restart nginx \ No newline at end of file + - restart nginx diff --git a/roles/jitsi-enable-multidomain/tasks/ssl.yml b/roles/jitsi-enable-multidomain/tasks/ssl.yml index f9b8d28..09a8711 100644 --- a/roles/jitsi-enable-multidomain/tasks/ssl.yml +++ b/roles/jitsi-enable-multidomain/tasks/ssl.yml @@ -9,7 +9,7 @@ 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 + remote_src: true when: not ssl_file.stat.exists - name: Conf SSL MultiDomain - rend le nom de domaine paramétrable dans le script certbot de jitsi @@ -19,9 +19,9 @@ 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 + command: "/usr/share/jitsi-meet/scripts/install-letsencrypt-cert-with-param.sh {{ item }}" + args: + 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 -- cgit v1.2.3