From 0a590b6679dd8d7367115561724629f56008e1c9 Mon Sep 17 00:00:00 2001
From: William Hirigoyen <whirigoyen+git@evolix.fr>
Date: Wed, 3 Jan 2024 11:29:20 +0100
Subject: [PATCH] nginx: fix multiple fails in check mode

---
 CHANGELOG.md                        | 2 ++
 nginx/handlers/main.yml             | 3 +++
 nginx/tasks/ip_whitelist.yml        | 2 ++
 nginx/tasks/main.yml                | 3 +++
 nginx/tasks/munin_vhost.yml         | 1 +
 nginx/tasks/server_status_read.yml  | 4 +++-
 nginx/tasks/server_status_write.yml | 1 +
 7 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd9c70f4..574a66bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,8 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * webapps/nextcloud: fix Add Ceph volume to fstab : missing UUID= in src
 * webapps/nextcloud: fix misplaced gid attribute
 * webapps/nextcloud: fix missing gid
+* nginx: fix mistake between "check_mode: no" and "when: not ansible_check_mode" (fail in check mode)
+* nginx: add "when: not ansible_check_mode" in various tasks to prevent fail in check mode
 
 ### Removed
 
diff --git a/nginx/handlers/main.yml b/nginx/handlers/main.yml
index bdd5f477..af2cabf0 100644
--- a/nginx/handlers/main.yml
+++ b/nginx/handlers/main.yml
@@ -3,13 +3,16 @@
   ansible.builtin.service:
     name: nginx
     state: restarted
+  when: not ansible_check_mode
 
 - name: reload nginx
   ansible.builtin.service:
     name: nginx
     state: reloaded
+  when: not ansible_check_mode
 
 - name: restart munin
   ansible.builtin.service:
     name: munin-node
     state: restarted
+  when: not ansible_check_mode
diff --git a/nginx/tasks/ip_whitelist.yml b/nginx/tasks/ip_whitelist.yml
index fc4fd2d2..6186b419 100644
--- a/nginx/tasks/ip_whitelist.yml
+++ b/nginx/tasks/ip_whitelist.yml
@@ -6,6 +6,7 @@
     line: "allow {{ item }};"
     state: present
   loop: "{{ nginx_ipaddr_whitelist_present }}"
+  when: not ansible_check_mode
   notify: reload nginx
   tags:
     - nginx
@@ -17,6 +18,7 @@
     line: "allow {{ item }};"
     state: absent
   loop: "{{ nginx_ipaddr_whitelist_absent }}"
+  when: not ansible_check_mode
   notify: reload nginx
   tags:
     - nginx
diff --git a/nginx/tasks/main.yml b/nginx/tasks/main.yml
index 57a036d4..5d2f56cf 100644
--- a/nginx/tasks/main.yml
+++ b/nginx/tasks/main.yml
@@ -24,6 +24,7 @@
     line: '\1worker_connections 1024;'
     insertafter: 'events \{'
     backrefs: yes
+  when: not ansible_check_mode
   tags:
     - nginx
 
@@ -34,6 +35,7 @@
     line: '\1use epoll;'
     insertafter: 'events \{'
     backrefs: yes
+  when: not ansible_check_mode
   tags:
     - nginx
 
@@ -145,6 +147,7 @@
     name: nginx
     enabled: yes
     state: started
+  when: not ansible_check_mode
   tags:
     - nginx
 
diff --git a/nginx/tasks/munin_vhost.yml b/nginx/tasks/munin_vhost.yml
index 98cc8672..eb08cd72 100644
--- a/nginx/tasks/munin_vhost.yml
+++ b/nginx/tasks/munin_vhost.yml
@@ -37,3 +37,4 @@
     daemon_reload: yes
     enabled: yes
     state: started
+  when: not ansible_check_mode
diff --git a/nginx/tasks/server_status_read.yml b/nginx/tasks/server_status_read.yml
index d6cecbe3..b334a729 100644
--- a/nginx/tasks/server_status_read.yml
+++ b/nginx/tasks/server_status_read.yml
@@ -26,13 +26,15 @@
   ansible.builtin.command:
     cmd: "tail -n 1 {{ nginx_serverstatus_suffix_file }}"
   changed_when: False
-  check_mode: no
+  when: not ansible_check_mode
   register: new_nginx_serverstatus_suffix
 
 - name: overwrite nginx_serverstatus_suffix
   ansible.builtin.set_fact:
     nginx_serverstatus_suffix: "{{ new_nginx_serverstatus_suffix.stdout }}"
+  when: not ansible_check_mode
 
 - ansible.builtin.debug:
     var: nginx_serverstatus_suffix
     verbosity: 1
+  when: not ansible_check_mode
diff --git a/nginx/tasks/server_status_write.yml b/nginx/tasks/server_status_write.yml
index dbed56cb..08031635 100644
--- a/nginx/tasks/server_status_write.yml
+++ b/nginx/tasks/server_status_write.yml
@@ -17,4 +17,5 @@
     dest: /etc/nginx/sites-available/evolinux-default.conf
     regexp: 'location /server-status-? {'
     replace: 'location /server-status-{{ nginx_serverstatus_suffix }} {'
+  when: not ansible_check_mode
   notify: reload nginx