Skip to content

Commit

Permalink
Merge branch 'main' into fix-syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
EarthlingDavey authored Nov 7, 2024
2 parents 8b42224 + 041d11f commit fa1b5ba
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions deploy/demo/ingress.tpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ metadata:
nginx.ingress.kubernetes.io/enable-modsecurity: "true"
nginx.ingress.kubernetes.io/modsecurity-snippet: |
${MODSEC_CONFIG}
nginx.ingress.kubernetes.io/proxy-body-size: "250m"
nginx.ingress.kubernetes.io/auth-type: basic
nginx.ingress.kubernetes.io/auth-secret: basic-auth-secret
nginx.ingress.kubernetes.io/auth-realm: 'Demo User | Authentication Required'
Expand Down
1 change: 1 addition & 0 deletions deploy/development/ingress.tpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ metadata:
nginx.ingress.kubernetes.io/enable-modsecurity: "true"
nginx.ingress.kubernetes.io/modsecurity-snippet: |
${MODSEC_CONFIG}
nginx.ingress.kubernetes.io/proxy-body-size: "250m"
nginx.ingress.kubernetes.io/auth-type: basic
nginx.ingress.kubernetes.io/auth-secret: basic-auth-secret
nginx.ingress.kubernetes.io/auth-realm: 'Development Access | Authentication Required'
Expand Down
1 change: 1 addition & 0 deletions deploy/production/ingress.tpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ metadata:
nginx.ingress.kubernetes.io/enable-modsecurity: "true"
nginx.ingress.kubernetes.io/modsecurity-snippet: |
${MODSEC_CONFIG}
nginx.ingress.kubernetes.io/proxy-body-size: "250m"
# Set vhost so that WP doesn't see prod-intranet.apps... and redirect.
nginx.ingress.kubernetes.io/upstream-vhost: intranet.justice.gov.uk
nginx.ingress.kubernetes.io/server-snippet: |
Expand Down
1 change: 1 addition & 0 deletions deploy/staging/ingress.tpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ metadata:
nginx.ingress.kubernetes.io/enable-modsecurity: "true"
nginx.ingress.kubernetes.io/modsecurity-snippet: |
${MODSEC_CONFIG}
nginx.ingress.kubernetes.io/proxy-body-size: "250m"
nginx.ingress.kubernetes.io/server-snippet: |
location = /health {
auth_basic off;
Expand Down

0 comments on commit fa1b5ba

Please sign in to comment.