Merge pull request #6256 from mailcow/staging

FreddleSpl0it · web-flow · commit ba0349a91135 · 2025-01-23T14:55:38.000+01:00
[Nginx] move conf.d include to end of nginx.conf
diff --git a/data/conf/nginx/templates/nginx.conf.j2 b/data/conf/nginx/templates/nginx.conf.j2
@@ -27,8 +27,6 @@ http {
 
     #gzip  on;
 
-    include /etc/nginx/conf.d/*.conf;
-
     # map-size.conf:
     map_hash_max_size 256;
     map_hash_bucket_size 256;
@@ -124,4 +122,6 @@ http {
         include /etc/nginx/includes/sites-default.conf;
     }
     {% endfor %}
+
+    include /etc/nginx/conf.d/*.conf;
 }

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@ http {`
`27`	`27`
`28`	`28`	`#gzip on;`
`29`	`29`
`30`		`- include /etc/nginx/conf.d/*.conf;`
`31`		`-`
`32`	`30`	`# map-size.conf:`
`33`	`31`	`map_hash_max_size 256;`
`34`	`32`	`map_hash_bucket_size 256;`
`@@ -124,4 +122,6 @@ http {`
`124`	`122`	`include /etc/nginx/includes/sites-default.conf;`
`125`	`123`	`}`
`126`	`124`	`{% endfor %}`
	`125`	`+`
	`126`	`+ include /etc/nginx/conf.d/*.conf;`
`127`	`127`	`}`