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

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

See merge request sys/ansible-public!27

roles/bench-worker/meta/main.yml

 ---
-
 dependencies:
   - role: conf
   - role: init
   - role: sysconfig
-...

roles/bench-worker/tasks/main.yml

 ---
-
 - name: install bench-worker packages
   ansible.builtin.apt:
     force_apt_get: true
@@ -15,7 +14,7 @@
   ansible.builtin.file:
     path: /etc/mediaserver
     state: directory
-    mode: '755'
+    mode: "755"
 
 - name: benchmark configuration settings
   ansible.builtin.copy:
@@ -30,7 +29,7 @@
       "DL_STREAMS":{{ bench_dl_streams }},
       "TIME_STATS":{{ bench_time_stat }}
       }
-    mode: '644'
+    mode: "644"
 
 - name: reload systemd daemon
   ansible.builtin.systemd:
@@ -40,5 +39,3 @@
   ansible.builtin.systemd:
     name: bench-worker
     state: restarted
-
-...

roles/celerity/defaults/main.yml

 ---
-
 celerity_signing_key: "{{ envsetup_celerity_signing_key | d('change-me', true) }}"
 celerity_server: "{{ envsetup_celerity_server | d(envsetup_ms_server_name, true) | d('127.0.0.1', true) }}"
 
@@ -20,5 +19,3 @@ celerity_ferm_input_rules:
       - 6200
 celerity_ferm_output_rules: []
 celerity_ferm_global_settings:
-
-...

roles/celerity/handlers/main.yml

 ---
-
 - name: restart celerity-server
   ansible.builtin.service:
     name: celerity-server
     state: restarted
-
-...

roles/celerity/meta/main.yml

 ---
-
 dependencies:
   - role: base
-
-...

roles/celerity/tasks/main.yml

 ---
-
 - name: celerity server install
   ansible.builtin.apt:
     force_apt_get: true
@@ -14,7 +13,7 @@
   ansible.builtin.template:
     src: celerity-config.py.j2
     dest: /etc/celerity/config.py
-    mode: '644'
+    mode: "644"
 
 - name: ensure celerity server is running
   ansible.builtin.service:
@@ -36,5 +35,3 @@
 
 - name: flush handlers
   ansible.builtin.meta: flush_handlers
-
-...

roles/conf/defaults/main.yml

 ---
-
 conf_req_packages:
   - ca-certificates
   - openssh-client
@@ -18,5 +17,3 @@ skyreach_system_key: "{{ lookup('env', 'SKYREACH_SYSTEM_KEY') }}"
 conf_update: false
 
 conf_debug: false
-
-...

roles/conf/tasks/main.yml

 ---
-
 - name: proxy
   when:
     - proxy_http | d()
@@ -83,7 +82,7 @@
     return_content: true
     validate_certs: "{{ conf_valid_cert }}"
 
-- name: save generated conf  # noqa no-handler
+- name: save generated conf # noqa no-handler
   loop:
     - "{{ conf_dl_ak }}"
     - "{{ conf_dl_sk }}"
@@ -93,7 +92,7 @@
     dest: "{{ conf_dir }}/auto-generated-conf.sh"
     force: true
     backup: true
-    mode: '644'
+    mode: "644"
 
 - name: check if auto-generated-conf.sh exists
   check_mode: false
@@ -129,5 +128,3 @@
   when: conf_debug
   ansible.builtin.debug:
     var: ansible_facts
-
-...

roles/docker/tasks/main.yml

@@ -58,5 +58,3 @@
   register: apt_status
   retries: 60
   until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
-
-...

roles/elastic/defaults/main.yml

 ---
 kibana_default_port: 5601
 kibana_server_host: localhost
-
-...

roles/elastic/handlers/main.yml

@@ -8,5 +8,3 @@
   ansible.builtin.service:
     name: apm-server
     state: restarted
-
-...

roles/elastic/tasks/main.yml

@@ -13,7 +13,7 @@
   ansible.builtin.template:
     src: kibana.yml.j2
     dest: /etc/kibana/kibana.yml
-    mode: '644'
+    mode: "644"
   notify: restart kibana
 
 - name: install apm-server package
@@ -30,7 +30,5 @@
   ansible.builtin.template:
     src: apm-server.yml.j2
     dest: /etc/apm-server/apm-server.yml
-    mode: '644'
+    mode: "644"
   notify: restart apm-server
-
-...

roles/fail2ban/defaults/main.yml

 ---
-
 f2b_packages:
   - fail2ban
   - rsyslog
@@ -28,5 +27,3 @@ f2b_destemail_admins: >
   {% endif %}"
 
 f2b_action: "{% if envsetup_fail2ban_send_email | default(false) %}action_mwl{% else %}action_{% endif %}"
-
-...

roles/fail2ban/handlers/main.yml

 ---
-
 - name: restart fail2ban
   ansible.builtin.systemd:
     name: fail2ban
     state: restarted
-
-...

roles/fail2ban/tasks/main.yml

 ---
-
 - name: packages
   ansible.builtin.apt:
     force_apt_get: true
@@ -15,12 +14,10 @@
   ansible.builtin.template:
     src: jail.local.j2
     dest: /etc/fail2ban/jail.local
-    mode: '644'
+    mode: "644"
 
 - name: service
   ansible.builtin.systemd:
     name: fail2ban
     enabled: true
     state: started
-
-...

roles/ferm-configure/defaults/main.yml

 ---
-
 # filename into which rules will be written
 # /etc/ferm/{ferm|input|output|forward}.d/<filename>.conf
 ferm_rules_filename: default
 
 # input rule
 ferm_input_rules: []
-
 # ouput rule
 ferm_output_rules: []
-
 # forward rule
 ferm_forward_rules: []
-
 # global settings to be put in ferm.d directory
 ferm_global_settings:
-
-...

roles/ferm-configure/handlers/main.yml

 ---
-
 - name: restart ferm
   when: ansible_facts.services['ferm.service'] is defined
   ansible.builtin.systemd:
@@ -11,4 +10,3 @@
   ansible.builtin.systemd:
     name: fail2ban
     state: started
-...

roles/ferm-configure/tasks/main.yml

 ---
-
 - name: populate service facts
   ansible.builtin.service_facts:
-
 - name: directories
   loop:
     - /etc/ferm/ferm.d
@@ -12,7 +10,7 @@
   ansible.builtin.file:
     path: "{{ item }}"
     state: directory
-    mode: '755'
+    mode: "755"
 
 - name: global
   when: ferm_global_settings | d(false)
@@ -22,7 +20,7 @@
   ansible.builtin.copy:
     dest: /etc/ferm/ferm.d/{{ ferm_rules_filename }}.conf
     content: "{{ ferm_global_settings }}"
-    mode: '644'
+    mode: "644"
 
 - name: input
   when: ferm_input_rules | length > 0
@@ -32,7 +30,7 @@
   ansible.builtin.template:
     src: ferm_rules_input.conf.j2
     dest: /etc/ferm/input.d/{{ ferm_rules_filename }}.conf
-    mode: '644'
+    mode: "644"
 
 - name: output
   when: ferm_output_rules | length > 0
@@ -42,7 +40,7 @@
   ansible.builtin.template:
     src: ferm_rules_output.conf.j2
     dest: /etc/ferm/output.d/{{ ferm_rules_filename }}.conf
-    mode: '644'
+    mode: "644"
 
 - name: forward
   when: ferm_forward_rules | length > 0
@@ -52,6 +50,4 @@
   ansible.builtin.template:
     src: ferm_rules_forward.conf.j2
     dest: /etc/ferm/forward.d/{{ ferm_rules_filename }}.conf
-    mode: '644'
-
-...
+    mode: "644"

roles/ferm-install/defaults/main.yml

 ---
-
 # packages to install
 ferm_packages:
   - ferm
@@ -21,5 +20,3 @@ ferm_forward_log_prefix: "{{ ferm_forward_policy }} FORWARD "
 
 # enable anti-lockout rule
 ferm_antilockout_enabled: true
-
-...

roles/ferm-install/handlers/main.yml

 ---
-
 - name: restart ferm
   ansible.builtin.systemd:
     name: ferm
     state: restarted
-
-...