Skip to content

Commit 3365353

Browse files
committed
Skip some gixy checks
sed -ir '/add_header_inherit/d' docker/webserver/nginx_templates/default.conf.template
1 parent 7618b8e commit 3365353

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ fix: ## fix trivial linting error automatically
311311
${DOCKER_COMPOSE_TOOLS_CMD} run --rm tools bin/lint.sh ${pysrcdirs}
312312

313313
check-gixy: env=test
314-
check-gixy: ## run nginx config check
315-
${DOCKER_COMPOSE_CMD} exec webserver /opt/gixy/bin/gixy /etc/nginx/nginx.conf
314+
check-gixy: ## run nginx config check, skip the checks HSTS max-age=0 and header redefinitions
315+
${DOCKER_COMPOSE_CMD} exec webserver /opt/gixy/bin/gixy -skips hsts_header,add_header_redefinition /etc/nginx/nginx.conf
316316

317317
build-tools tools-build: ## build tools image
318318
${DOCKER_COMPOSE_TOOLS_CMD} build tools

docker/webserver/nginx_templates/default.conf.template

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ server {
294294

295295
# monitoring, requires authentication, override headers, since CSP is too strict
296296
location /grafana {
297-
add_header_inherit off;
298297
include http.headers;
299298
include hsts_h3.headers;
300299
auth_basic "Please enter your monitoring username and password";
@@ -304,7 +303,6 @@ server {
304303
proxy_pass $grafana;
305304
}
306305
location /prometheus {
307-
add_header_inherit off;
308306
include http.headers;
309307
include hsts_h3.headers;
310308
auth_basic "Please enter your monitoring username and password";
@@ -314,7 +312,6 @@ server {
314312
proxy_pass $prometheus;
315313
}
316314
location /alertmanager {
317-
add_header_inherit off;
318315
include http.headers;
319316
include hsts_h3.headers;
320317
auth_basic "Please enter your monitoring username and password";
@@ -326,7 +323,6 @@ server {
326323

327324
# routinator proxy for internal use on multi instance setups
328325
location /routinator/ {
329-
add_header_inherit off;
330326
include http.headers;
331327
include hsts_h3.headers;
332328

0 commit comments

Comments
 (0)