From f1419d805213725710bd03f4036146634ece6db3 Mon Sep 17 00:00:00 2001
From: Ludovic Cartier <ludovic.cartier@alterway.fr>
Date: Mon, 10 Nov 2025 11:41:54 +0100
Subject: [PATCH] various update

---
 defaults/main.yml                             |  5 +++++
 tasks/status.yml                              | 19 ++++++++++++-------
 tasks/vhost.yml                               |  8 +++-----
 files/status.conf => templates/status.conf.j2 | 13 +++----------
 4 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 defaults/main.yml
 rename files/status.conf => templates/status.conf.j2 (50%)

diff --git a/defaults/main.yml b/defaults/main.yml
new file mode 100644
index 0000000..44add4b
--- /dev/null
+++ b/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+nginx_http_port: 80
+nginx_user: www-data
+nginx_group: www-data
+nginx_documentroot_default: /var/www/html
\ No newline at end of file
diff --git a/tasks/status.yml b/tasks/status.yml
index 90cb07e..c8e70fa 100644
--- a/tasks/status.yml
+++ b/tasks/status.yml
@@ -1,15 +1,20 @@
 ---
-- name: "nginx | copy status vhost"
-  copy:
-    src: "status.conf"
-    dest: "/etc/nginx/sites-available/00-status.conf"
+- name: 'nginx | copy status vhost'
+  template:
+    src: status.conf.j2
+    dest: /etc/nginx/sites-available/00-status.conf
+    owner: root
     mode: "0644"
-    force: yes
-    backup: yes
-  when: is_nginx
+  notify:
+    - 'nginx restart'
+  tags:
+    - nginx
+    - nginx_configure
 
 - name: "nginx | activate the status vhost"
   file: 
     src: "/etc/nginx/sites-available/00-status.conf"
     dest: "/etc/nginx/sites-enabled/00-status.conf"
     state: link
+  notify:
+    - 'nginx restart'
\ No newline at end of file
diff --git a/tasks/vhost.yml b/tasks/vhost.yml
index 5b46198..4c0e068 100644
--- a/tasks/vhost.yml
+++ b/tasks/vhost.yml
@@ -52,18 +52,16 @@
 
 - name: 'nginx | configure nginx logs'
   file:
-    path: "/var/log/nginx/{{ item.value.servername }}"
+    path: "/var/log/nginx/{{ item.value.log_path }}"
     state: directory
     owner: root
     group: adm
   loop: "{{ nginx_vhosts | dict2items }}"
   loop_control:
-    label: "{{ item.value.servername | default([]) }}"
+    label: "{{ item.value.log_path | default([]) }}"
   when:
     - nginx_vhosts is defined
-    - item.value.enabled is undefined or item.value.enabled
-    - item.value.documentroot is defined
-    - item.value.documentroot != False
+    - item.value.log_path is undefined or item.value.log_path
   notify:
     - nginx reload
   tags:
diff --git a/files/status.conf b/templates/status.conf.j2
similarity index 50%
rename from files/status.conf
rename to templates/status.conf.j2
index d66c9ac..b7812bd 100644
--- a/files/status.conf
+++ b/templates/status.conf.j2
@@ -1,9 +1,9 @@
 server {
-    listen 127.0.0.1:80;
+    listen 127.0.0.1:{{ nginx_http_port }};
     server_name _;
 
-    access_log /var/log/nginx/localhost.access.log;
-    error_log /var/log/nginx/localhost.error.log;
+    #access_log /var/log/nginx/localhost.access.log;
+    #error_log /var/log/nginx/localhost.error.log;
 
     location ~ /.well-known/acme-challenge/ {
         alias /var/www/challenges/;
@@ -19,13 +19,6 @@ server {
         deny all;
     }
 
-#    location /php_status {
-#        access_log off;
-#        include /etc/nginx/fastcgi_params;
-#        fastcgi_pass unix:/run/php/php7.0-fpm.sock;
-#        fastcgi_param SCRIPT_FILENAME $fastcgi_script_name;
-#    }
-
     location / {
         deny all;
     }