From 47b242ae7735413ac0c1a48e3f9037b1f7d9673c Mon Sep 17 00:00:00 2001
From: skorpy <magnus@skorpy.space>
Date: Fri, 15 Jan 2021 22:42:43 +0100
Subject: [PATCH] Update nginx/files/sites/freifunk.fail.conf.j2,
grafana/files/varnish-grafana.vcl.j2 files
---
grafana/files/varnish-grafana.vcl.j2 | 1 -
nginx/files/sites/freifunk.fail.conf.j2 | 27 ++++++++++++++-----------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/grafana/files/varnish-grafana.vcl.j2 b/grafana/files/varnish-grafana.vcl.j2
index 67b4f401..9d642d9d 100644
--- a/grafana/files/varnish-grafana.vcl.j2
+++ b/grafana/files/varnish-grafana.vcl.j2
@@ -127,7 +127,6 @@ sub vcl_deliver {
unset resp.http.Date;
unset resp.http.Via;
unset resp.http.Age;
- set resp.http.Vary = "Accept-Encoding";
set resp.http.Server = "nginx";
set resp.http.Date = now;
diff --git a/nginx/files/sites/freifunk.fail.conf.j2 b/nginx/files/sites/freifunk.fail.conf.j2
index 7deab0b0..20c4bbcd 100644
--- a/nginx/files/sites/freifunk.fail.conf.j2
+++ b/nginx/files/sites/freifunk.fail.conf.j2
@@ -34,22 +34,25 @@ server {
client_max_body_size 16m;
location / {
- proxy_pass http://grafana;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://grafana;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_set_header Host $host;
}
location /render/ {
- proxy_pass http://unix:/var/run/varnish.sock;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://unix:/var/run/varnish.sock;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_set_header Host $host;
}
location /public/ {
- proxy_pass http://unix:/var/run/varnish.sock;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://unix:/var/run/varnish.sock;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_set_header Host $host;
}
}
--
GitLab