From 2bc9af13085f7d591472669a71cf8c8733fc89da Mon Sep 17 00:00:00 2001 From: Antoine Ouvrard Date: Tue, 4 May 2021 17:27:25 +0200 Subject: [PATCH] yamllint --- roles/bbb-disable-test-echo/tasks/main.yml | 3 ++- roles/bbb-enable-sip/tasks/main.yml | 11 +++++---- roles/bbb-set-hostname/tasks/main.yml | 8 +++++-- roles/jitsi-add-sip/tasks/main.yml | 12 ++++++---- roles/jitsi-enable-auth/tasks/main.yml | 5 ++-- .../tasks/main.yml | 3 ++- roles/jitsi-enable-jibri/tasks/main.yml | 4 ++++ roles/jitsi-enable-metrics/tasks/main.yml | 3 ++- .../jitsi-enable-multidomain/tasks/jitsi.yml | 4 +++- .../jitsi-enable-multidomain/tasks/nginx.yml | 3 ++- roles/jitsi-enable-multidomain/tasks/ssl.yml | 23 +++++++++++++------ .../jitsi-enable-specific-imio/tasks/main.yml | 2 +- .../tasks/main.yml | 3 +++ roles/jitsi-install/tasks/main.yml | 13 ++++++++--- 14 files changed, 68 insertions(+), 29 deletions(-) diff --git a/roles/bbb-disable-test-echo/tasks/main.yml b/roles/bbb-disable-test-echo/tasks/main.yml index ccd31ac..6bd9657 100644 --- a/roles/bbb-disable-test-echo/tasks/main.yml +++ b/roles/bbb-disable-test-echo/tasks/main.yml @@ -1,7 +1,8 @@ --- - name: Désactivation du test d'écho effectué lors de l'accès à la room lineinfile: - path: /usr/share/meteor/bundle/programs/server/assets/app/config/settings.yml + path: + /usr/share/meteor/bundle/programs/server/assets/app/config/settings.yml regexp: ' skipCheck: false' line: ' skipCheck: true' notify: diff --git a/roles/bbb-enable-sip/tasks/main.yml b/roles/bbb-enable-sip/tasks/main.yml index d7788e0..a368c2a 100644 --- a/roles/bbb-enable-sip/tasks/main.yml +++ b/roles/bbb-enable-sip/tasks/main.yml @@ -29,16 +29,19 @@ lineinfile: path: /usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties regexp: "defaultWelcomeMessageFooter=" - line: - "defaultWelcomeMessageFooter=Pour rejoindre la conférence par téléphone, - appeler au numéro :
%%DIALNUM%%
puis saisir le code :
%%CONFNUM%%" + line: > + "defaultWelcomeMessageFooter=Pour rejoindre la conférence par + téléphone, appeler au numéro :
%%DIALNUM%%
+ puis saisir le code :
%%CONFNUM%%" notify: - restart bigbluebutton - name: Changement du message d'accueil audio copy: src: "{{ inventory_hostname }}/bbb-sounds/{{ item }}/conf-pin.wav" - dest: "/opt/freeswitch/share/freeswitch/sounds/en/us/callie/conference/{{ item }}/" + dest: + # yamllint disable-line rule:line-length + "/opt/freeswitch/share/freeswitch/sounds/en/us/callie/conference/{{ item }}/" owner: freeswitch group: daemon mode: u=rw,g=r,o=r diff --git a/roles/bbb-set-hostname/tasks/main.yml b/roles/bbb-set-hostname/tasks/main.yml index 4cdef9d..651c9d4 100644 --- a/roles/bbb-set-hostname/tasks/main.yml +++ b/roles/bbb-set-hostname/tasks/main.yml @@ -19,7 +19,9 @@ - name: Récup du hostname actuellement configuré set_fact: - oldHostname: "{{ lookup('ini', 'bigbluebutton.web.serverURL type=properties file=/tmp/bigbluebutton.properties') | urlsplit('hostname') }}" + oldHostname: + # yamllint disable-line rule:line-length + "{{ lookup('ini', 'bigbluebutton.web.serverURL type=properties file=/tmp/bigbluebutton.properties') | urlsplit('hostname') }}" - name: execution de la commande bigbluebutton qui set le nouveau nom de domaine command: "bbb-conf --setip {{ bbbHostname }}" @@ -56,7 +58,9 @@ when: not ssl_file.stat.exists - name: Certif LE - command: certbot --webroot -w /var/www/bigbluebutton-default/ -d {{ bbbHostname }} certonly + command: + # yamllint disable-line rule:line-length + certbot --webroot -w /var/www/bigbluebutton-default/ -d {{ bbbHostname }} certonly when: not ssl_file.stat.exists - name: Suppression de la conf temporaire LE diff --git a/roles/jitsi-add-sip/tasks/main.yml b/roles/jitsi-add-sip/tasks/main.yml index b8c0db7..a280a51 100644 --- a/roles/jitsi-add-sip/tasks/main.yml +++ b/roles/jitsi-add-sip/tasks/main.yml @@ -1,9 +1,9 @@ --- -- name: Ajout du compte SIP +- name: Ajout du compte SIP debconf: - name: jigasi - question: jigasi/sip-account - value: '{{ jigasi_sip_account }}' + name: jigasi + question: jigasi/sip-account + value: '{{ jigasi_sip_account }}' vtype: string - name: Ajout du mot de passe SIP @@ -22,4 +22,6 @@ lineinfile: path: /etc/jitsi/jigasi/sip-communicator.properties regexp: "org.jitsi.jigasi.DEFAULT_JVB_ROOM_NAME=" - line: "org.jitsi.jigasi.DEFAULT_JVB_ROOM_NAME={{ jigasi_sip_room }}@conference.{{ inventory_hostname }}" + line: + # yamllint disable-line rule:line-length + "org.jitsi.jigasi.DEFAULT_JVB_ROOM_NAME={{ jigasi_sip_room }}@conference.{{ inventory_hostname }}" diff --git a/roles/jitsi-enable-auth/tasks/main.yml b/roles/jitsi-enable-auth/tasks/main.yml index dcda8dc..df23634 100644 --- a/roles/jitsi-enable-auth/tasks/main.yml +++ b/roles/jitsi-enable-auth/tasks/main.yml @@ -9,7 +9,7 @@ - restart jitsi-videobridge2 - restart jicofo -- name: Conf Jitsi - Activation de l'authentification prosody 2/2 +- name: Conf Jitsi - Activation de l'authentification prosody 2/2 blockinfile: path: /etc/prosody/conf.d/{{ inventory_hostname }}.cfg.lua marker: "-- {mark} ANSIBLE MANAGED BLOCK" @@ -43,7 +43,8 @@ - restart jicofo - name: Conf Jitsi - Création de l'utilisateur prosody - command: prosodyctl register {{ jitsi_user }} {{ inventory_hostname }} {{ jitsi_pass }} + command: + prosodyctl register {{jitsi_user}} {{inventory_hostname}} {{jitsi_pass}} notify: - restart prosody - restart jitsi-videobridge2 diff --git a/roles/jitsi-enable-external-coturn/tasks/main.yml b/roles/jitsi-enable-external-coturn/tasks/main.yml index 4997a72..b14755b 100644 --- a/roles/jitsi-enable-external-coturn/tasks/main.yml +++ b/roles/jitsi-enable-external-coturn/tasks/main.yml @@ -23,7 +23,8 @@ - ['port = 5349', 'port = 443'] notify: restart prosody -- name: indique a jitsi les règles d'échange des credentials pour le coturn externe +- name: indique a jitsi les règles d'échange des credentials + pour le coturn externe blockinfile: path: /etc/prosody/conf.d/{{ inventory_hostname }}.cfg.lua marker: "-- {mark} ANSIBLE MANAGED BLOCK" diff --git a/roles/jitsi-enable-jibri/tasks/main.yml b/roles/jitsi-enable-jibri/tasks/main.yml index 3d0ff9a..ef67d0e 100644 --- a/roles/jitsi-enable-jibri/tasks/main.yml +++ b/roles/jitsi-enable-jibri/tasks/main.yml @@ -20,16 +20,20 @@ - restart prosody - name: utilisateur jibri pour prosody (auth) + # yamllint disable-line rule:line-length command: prosodyctl register {{ item.user }} auth.{{ inventory_hostname }} {{ item.password }} args: # Prosody remplace les points par des '%2e' dans le chemin du fichier + # yamllint disable-line rule:line-length creates: /var/lib/prosody/{{ 'auth%2e'+inventory_hostname | replace('.', '%2e') }}/accounts/{{ item.user }}.dat loop: "{{ jibri_users }}" - name: utilisateur jibri pour prosody (recorder) + # yamllint disable-line rule:line-length command: prosodyctl register {{ item.user }}-record recorder.{{ inventory_hostname }} {{ item.password }} args: # Prosody remplace les points par des '%2e' dans le chemin du fichier + # yamllint disable-line rule:line-length creates: /var/lib/prosody/{{ 'auth%2e'+inventory_hostname | replace('.', '%2e') }}/accounts/{{ item.user }}.dat loop: "{{ jibri_users }}" diff --git a/roles/jitsi-enable-metrics/tasks/main.yml b/roles/jitsi-enable-metrics/tasks/main.yml index ed49c97..d808a00 100644 --- a/roles/jitsi-enable-metrics/tasks/main.yml +++ b/roles/jitsi-enable-metrics/tasks/main.yml @@ -7,7 +7,8 @@ regexp: "^org.jitsi.videobridge.ENABLE_STATISTICS" line: "org.jitsi.videobridge.ENABLE_STATISTICS=true" -- name: configuration du videobridge pour transporter les stats via colibri REST api +- name: configuration du videobridge pour transporter les stats + via colibri REST api lineinfile: path: "/etc/jitsi/videobridge/sip-communicator.properties" regexp: "^org.jitsi.videobridge.STATISTICS_TRANSPORT" diff --git a/roles/jitsi-enable-multidomain/tasks/jitsi.yml b/roles/jitsi-enable-multidomain/tasks/jitsi.yml index a3279aa..dd55dd5 100644 --- a/roles/jitsi-enable-multidomain/tasks/jitsi.yml +++ b/roles/jitsi-enable-multidomain/tasks/jitsi.yml @@ -3,7 +3,9 @@ replace: path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js regexp: '[^?]{{ inventory_hostname }}/http-bind' - replace: '/http-bind' + replace: > + '/http-bind' notify: - restart jitsi-videobridge2 - restart nginx diff --git a/roles/jitsi-enable-multidomain/tasks/nginx.yml b/roles/jitsi-enable-multidomain/tasks/nginx.yml index f3fd694..3e8d77d 100644 --- a/roles/jitsi-enable-multidomain/tasks/nginx.yml +++ b/roles/jitsi-enable-multidomain/tasks/nginx.yml @@ -24,7 +24,8 @@ 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 +- 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 diff --git a/roles/jitsi-enable-multidomain/tasks/ssl.yml b/roles/jitsi-enable-multidomain/tasks/ssl.yml index 09a8711..ba1c7cf 100644 --- a/roles/jitsi-enable-multidomain/tasks/ssl.yml +++ b/roles/jitsi-enable-multidomain/tasks/ssl.yml @@ -12,23 +12,30 @@ 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 +- 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 - command: "/usr/share/jitsi-meet/scripts/install-letsencrypt-cert-with-param.sh {{ item }}" + command: + # yamllint disable-line rule:line-length + "/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 + 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;" + regexp: + "[^?]ssl_certificate /etc/letsencrypt/live/{{ inventory_hostname }}.*$" + replace: + "ssl_certificate /etc/letsencrypt/live/{{ item }}/fullchain.pem;" loop: "{{ jitsi_multidomain_domain }}" notify: - restart nginx @@ -36,8 +43,10 @@ - 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;" + 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/tasks/main.yml b/roles/jitsi-enable-specific-imio/tasks/main.yml index 5866eeb..3bd1f01 100644 --- a/roles/jitsi-enable-specific-imio/tasks/main.yml +++ b/roles/jitsi-enable-specific-imio/tasks/main.yml @@ -82,5 +82,5 @@ regexp: '{{ item[0] }}' line: '{{ item[1] }}' loop: - - ['DEFAULT_LOGO_URL: ', " DEFAULT_LOGO_URL: 'images/visio.imio.be.svg',"] + - ['DEFAULT_LOGO_URL: ', " DEFAULT_LOGO_URL: 'images/visio.imio.be.svg',"] - ['JITSI_WATERMARK_LINK: ', " JITSI_WATERMARK_LINK: 'https://imio.be',"] diff --git a/roles/jitsi-enable-specific-komuniki/tasks/main.yml b/roles/jitsi-enable-specific-komuniki/tasks/main.yml index b31d63d..f112ffc 100644 --- a/roles/jitsi-enable-specific-komuniki/tasks/main.yml +++ b/roles/jitsi-enable-specific-komuniki/tasks/main.yml @@ -22,6 +22,9 @@ line: '{{ item[1] }}' loop: - ['APP_NAME: ', " APP_NAME: 'Komuniki',"] + # yamllint disable-line rule:line-length - ['DEFAULT_LOGO_URL: ', " DEFAULT_LOGO_URL: 'images/logo-komuniki.svg',"] + # yamllint disable-line rule:line-length - ['DEFAULT_WELCOME_PAGE_LOGO_URL: ', " DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/logo-komuniki-txt.svg',"] + # yamllint disable-line rule:line-length - ['JITSI_WATERMARK_LINK: ', " JITSI_WATERMARK_LINK: 'https://komuniki.fr',"] diff --git a/roles/jitsi-install/tasks/main.yml b/roles/jitsi-install/tasks/main.yml index ccf9d70..bf78cae 100644 --- a/roles/jitsi-install/tasks/main.yml +++ b/roles/jitsi-install/tasks/main.yml @@ -10,6 +10,7 @@ state: present - name: Mise en place des règle firewall tcp et udp + # yamllint disable-line rule:line-length # source : https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-quickstart#setup-and-configure-your-firewall ufw: state: enabled @@ -26,6 +27,7 @@ - ['5349', 'tcp'] - ['5222', 'tcp'] # XMPP port for recorder +# yamllint disable-line rule:line-length - name: Import de la clé GPG # source: https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-quickstart#add-the-jitsi-package-repository apt_key: id: FFD65A0DA2BEBDEB73D44C8BB4D2D216F1FD7806 @@ -34,6 +36,7 @@ - name: Ajout du depot jitsi apt_repository: + # yamllint disable-line rule:line-length repo: deb [signed-by=/etc/apt/trusted.gpg.d/jitsi.gpg] https://download.jitsi.org stable/ update_cache: true @@ -48,7 +51,9 @@ debconf: name: jitsi-meet-web-config question: jitsi-meet/cert-choice - value: "Generate a new self-signed certificate (You will later get a chance to obtain a Let's encrypt certificate)" + value: > + "Generate a new self-signed certificate (You will later get a chance to + obtain a Let's encrypt certificate)" vtype: string - name: installation de jitsi @@ -65,8 +70,10 @@ - name: Exécution du script lets encrypt 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 + 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 - name: Ajout d'un memo pour suprimer manuellement Jitsi copy: