diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-06 14:25:20 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-06 14:25:20 -0500 |
| commit | cddca85c8404272080caa661ce59ab5dbafec794 (patch) | |
| tree | aac5b9fe51b26999e2e184ddfa2b4829f33794a5 /installation | |
| parent | ba7f9459b4798388eb4e441d096302c018354033 (diff) | |
| parent | 2698bbc9f63d0bfd59de182d361db03d54aa2a68 (diff) | |
| download | pleroma-cddca85c8404272080caa661ce59ab5dbafec794.tar.gz pleroma-cddca85c8404272080caa661ce59ab5dbafec794.zip | |
Merge branch 'develop' into revert/rich-media-censorship
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/pleroma.vcl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/installation/pleroma.vcl b/installation/pleroma.vcl index 154747aa6..13dad784c 100644 --- a/installation/pleroma.vcl +++ b/installation/pleroma.vcl @@ -1,3 +1,4 @@ +# Recommended varnishncsa logging format: '%h %l %u %t "%m %{X-Forwarded-Proto}i://%{Host}i%U%q %H" %s %b "%{Referer}i" "%{User-agent}i"' vcl 4.1; import std; @@ -14,8 +15,11 @@ acl purge { sub vcl_recv { # Redirect HTTP to HTTPS if (std.port(server.ip) != 443) { + set req.http.X-Forwarded-Proto = "http"; set req.http.x-redir = "https://" + req.http.host + req.url; return (synth(750, "")); + } else { + set req.http.X-Forwarded-Proto = "https"; } # CHUNKED SUPPORT @@ -105,7 +109,7 @@ sub vcl_hash { sub vcl_backend_fetch { # Be more lenient for slow servers on the fediverse - if bereq.url ~ "^/proxy/" { + if (bereq.url ~ "^/proxy/") { set bereq.first_byte_timeout = 300s; } |