Fix nginx to use conventional ngix conf.d

1 files changed, 1 insertions, 5 deletions

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;
 }