Merge branch 't36656-certbot-hook' into 'main'

Remove useless nginx test in post-hook | refs #36656

See merge request sys/ansible-public!27

playbooks/mediacache/deploy-minimal.yml

 ---
-
 - name: MEDIACACHE
   hosts: mediacache
   tags: mediacache
@@ -14,8 +13,8 @@
       notify: restart nginx on mediaservers
       ansible.builtin.lineinfile:
         path: /etc/nginx/conf.d/mediaserver-securelink.conf
-        line: "{{'\t'}}{{ securelink_ip }} 1;"  # noqa: no-tabs
-        insertafter: '^geo'
+        line: "{{'\t'}}{{ securelink_ip }} 1;"  # noqa no-tabs jinja[spacing]
+        insertafter: ^geo
       delegate_to: "{{ item }}"
       delegate_facts: true
       loop: "{{ groups['mediaserver'] }}"
@@ -28,5 +27,3 @@
       delegate_to: "{{ item }}"
       delegate_facts: true
       loop: "{{ groups['mediaserver'] }}"
-
-...

playbooks/mediacache/deploy-standalone.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: MEDIACACHE
   hosts: mediacache
   tags: mediacache
@@ -35,5 +34,3 @@
 
 - import_playbook: deploy-minimal.yml
   tags: mediacache
-
-...

playbooks/mediaimport.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: MEDIAIMPORT
   hosts: mediaimport
   tags: mediaimport
@@ -15,5 +14,3 @@
       when: proxy_apply | d(false)
       ansible.builtin.include_role:
         name: proxy
-
-...

playbooks/mediaserver.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: MEDIASERVER
   hosts: mediaserver
   tags: mediaserver
@@ -19,5 +18,3 @@
       when: proxy_apply | d(false)
       ansible.builtin.include_role:
         name: proxy
-
-...

playbooks/mediavault/add_backup.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: MEDIAVAULT
   hosts: mediavault
   tags: mediavault
   tasks:
-  - include_tasks: ressources/add_backup_task.yml
-    loop: "{{ mvt_backups }}"
-
-...
+    - include_tasks: ressources/add_backup_task.yml
+      loop: "{{ mvt_backups }}"

playbooks/mediavault/deploy.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: MEDIAVAULT
   hosts: mediavault
   tags: mediavault
@@ -15,5 +14,3 @@
       when: proxy_apply | d(false)
       ansible.builtin.include_role:
         name: proxy
-
-...

playbooks/mediavault/ressources/add_backup_task.yml

 ---
-
 - name: get {{ item.name  }} backup information
   stat: path={{ item.dest }}/backup.marker
   register: backup_marker
@@ -7,5 +6,3 @@
 - name: create {{ item.name }} backup
   ansible.builtin.shell: mediavaultctl add --backup-name "{{ item.name }}" --source-folder "{{ item.source  }}" --dest-folder "{{ item.dest }}"
   when: not backup_marker.stat.exists
-
-...

playbooks/mediaworker.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: MEDIAWORKER
   hosts: mediaworker
   tags: mediaworker
@@ -15,5 +14,3 @@
       when: proxy_apply | d(false)
       ansible.builtin.include_role:
         name: proxy
-
-...

playbooks/mirismanager.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: MIRIS MANAGER
   hosts: mirismanager
   tags: mirismanager
@@ -19,5 +18,3 @@
       when: proxy_apply | d(false)
       ansible.builtin.include_role:
         name: proxy
-
-...

playbooks/munin/all.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - import_playbook: msmonitor.yml
   tags: monitor
 - import_playbook: munin-node.yml
   tags: monitor
 - import_playbook: munin-server.yml
   tags: monitor
-
-...

playbooks/munin/msmonitor.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: msmonitor
   hosts: msmonitor
   tags: munin
   roles:
     - munin/msmonitor
-
-...

playbooks/munin/munin-node.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: Munin node
   hosts: munin_node
   tags: munin
   roles:
     - munin/munin-node
-
-...

playbooks/munin/munin-server.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: Munin server
   hosts: munin_server
   tags: munin
@@ -12,5 +11,3 @@
       with_items: "{{ groups['munin_node'] }}"
   roles:
     - munin/munin-server
-
-...

playbooks/netcapture.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: NETCAPTURE
   hosts: netcapture
   tags: netcapture
@@ -15,5 +14,3 @@
       when: proxy_apply | d(false)
       ansible.builtin.include_role:
         name: proxy
-
-...

playbooks/netcapture/deploy-minimal.yml

 ---
-
 - name: NETCAPTURE
   hosts: netcapture
   gather_facts: false
@@ -7,5 +6,3 @@
   roles:
     - lxc
     - netcapture
-
-...

playbooks/netcapture/deploy-standalone.yml

 ---
-
 - name: NETCAPTURE
   hosts: netcapture
   tags: netcapture
@@ -15,8 +14,7 @@
     server_ferm_global_settings:
   tasks:
     - name: firewall
-      when: ((server_firewall_enabled is defined) and server_firewall_enabled)
-            or (server_firewall_enabled is undefined)
+      when: ((server_firewall_enabled is defined) and server_firewall_enabled) or (server_firewall_enabled is undefined)
       vars:
         ferm_rules_filename: "{{ server_ferm_rules_filename }}"
         ferm_input_rules: "{{ server_ferm_input_rules }}"
@@ -27,5 +25,3 @@
 
 - import_playbook: deploy-minimal.yml
   tags: netcapture
-
-...

playbooks/postfix.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: POSTFIX
   hosts: all
   tags: all
   roles:
     - conf
     - postfix
-
-...

playbooks/postgres-ha.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - name: POSTGRES HA
   hosts: postgres
   tags: postgres
@@ -26,7 +25,7 @@
 
 - name: POSTGRES HA CLIENTS
   hosts: mediaserver
-  tags: ['postgres', 'mediaserver']
+  tags: [postgres, mediaserver]
   pre_tasks:
     - name: check that haproxy is configured
       ansible.builtin.assert:
@@ -34,5 +33,3 @@
         quiet: true
   roles:
     - haproxy
-
-...

playbooks/postgres-maintenance.yml

 #!/usr/bin/env ansible-playbook
 ---
-
 - import_playbook: postgres-maintenance/rephacheck_status.yml
-  tags: ['always']
-
+  tags: [always]
 - import_playbook: postgres-maintenance/fenced_to_standby.yml
-  tags: ['never', 'fenced-to-standby']
-
+  tags: [never, fenced-to-standby]
 - import_playbook: postgres-maintenance/standby_to_primary.yml
-  tags: ['never', 'standby-to-primary']
-
+  tags: [never, standby-to-primary]
 - import_playbook: postgres-maintenance/restart_repmgrd.yml
-  tags: ['never', 'restart-repmgrd', 'standby-to-primary']
-
-...
+  tags: [never, restart-repmgrd, standby-to-primary]

playbooks/postgres-maintenance/fenced_to_standby.yml

@@ -5,7 +5,7 @@
   tasks:
     - name: fail if node status if not fenced
       ansible.builtin.fail:
-        msg: "Current status {{ rephacheck['stdout'] }} must be fenced."
+        msg: Current status {{ rephacheck['stdout'] }} must be fenced.
       when: rephacheck['stdout'] != "fenced"
 
     - name: stop postgresql
@@ -39,9 +39,7 @@
       when: copy_from_primary is succeeded
 
     - name: register node as standby
-      ansible.builtin.command: "repmgr -f /etc/postgresql/13/main/repmgr.conf --force --verbose standby register"
+      ansible.builtin.command: repmgr -f /etc/postgresql/13/main/repmgr.conf --force --verbose standby register
       become: true
       become_user: postgres
       when: copy_from_primary is succeeded
-
-...