Fix nginx to use conventional ngix conf.d

2 files changed, 4 insertions, 11 deletions

diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index f78cd24b..7cb9b449 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -26,14 +26,11 @@
     - "/etc/nginx/modules-enabled"
     - "/var/log/nginx"
 
-- name: "Ensure nginx vhosts.d directory exists"
+- name: "Remove default nginx server block shipped by package"
   become: true
   ansible.builtin.file:
-    path: "/etc/nginx/vhosts.d"
-    state: "directory"
-    owner: "root"
-    group: "root"
-    mode: "0755"
+    path: "/etc/nginx/conf.d/default.conf"
+    state: "absent"
 
 - name: "Check if SSL certificate exists"
   become: true
diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2
index 1ebbe3df..518a8398 100644
--- a/roles/nginx/templates/nginx.conf.j2
+++ b/roles/nginx/templates/nginx.conf.j2
@@ -43,8 +43,6 @@ http {
         listen [::]:80 default_server;
 
         server_name {{ nginx_server_name }};
-
-        include /etc/nginx/conf.d/*.conf;
     }
     {% else %}
     # HTTP server - redirect to HTTPS
@@ -73,9 +71,7 @@ http {
 
         add_header X-Content-Type-Options nosniff always;
         add_header X-Frame-Options DENY always;
-
-        include /etc/nginx/conf.d/*.conf;
     }
 
-    include /etc/nginx/vhosts.d/*.conf;
+    include /etc/nginx/conf.d/*.conf;
 }