diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 391e622..6dea596 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -6,7 +6,7 @@ ADD nginx.conf /etc/nginx/nginx.conf ADD default.conf /etc/nginx/conf.d/default.conf ADD status.conf /etc/nginx/conf.d/status.conf -ADD security.conf /etc/nginx/conf.d/security.conf +ADD security.conf /etc/nginx/overrides.d/security.conf RUN touch /etc/nginx/conf.d/http.conf # Configuration file used for overriding default.conf server configuration. diff --git a/nginx/default.conf b/nginx/default.conf index 939dd74..6c5723e 100644 --- a/nginx/default.conf +++ b/nginx/default.conf @@ -135,7 +135,7 @@ server { } # Default security configuration which can be overridden. - include /etc/nginx/conf.d/security.conf; + include /etc/nginx/overrides.d/security.conf; # Allows for application specific configuration eg. Content-Security-Policy include /etc/nginx/overrides.d/*.conf; diff --git a/nginx/dev/default.conf b/nginx/dev/default.conf index 337f03e..b960dc6 100644 --- a/nginx/dev/default.conf +++ b/nginx/dev/default.conf @@ -137,7 +137,7 @@ server { } # Default security configuration which can be overridden. - include /etc/nginx/conf.d/security.conf; + include /etc/nginx/overrides.d/security.conf; # Allows for application specific configuration eg. Content-Security-Policy include /etc/nginx/overrides.d/*.conf;