Skip to content
This repository was archived by the owner on Jan 22, 2026. It is now read-only.

SKPR-538: Move security.conf to overrides directory. #117

Open
fubarhouse wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SKPR-538: Move security.conf to overrides directory. #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion nginx/default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion nginx/dev/default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down