Revert "public-access-proxy: fix haproxy config indentation"

This reverts commit 9168f27585.

Not required as per http://cbonte.github.io/haproxy-dconv/2.3/configuration.html#2.1
This commit is contained in:
Astro 2021-07-14 17:40:49 +02:00
parent 724e659016
commit 8240f7dc32
1 changed files with 10 additions and 6 deletions

View File

@ -91,13 +91,15 @@ in {
option forwardfor
http-request set-header X-Forwarded-Proto http
http-request set-header X-Forwarded-Port 80
${
${
concatMapStringsSep "\n" (proxyHost:
optionalString
(proxyHost.hostNames != [ ] && proxyHost.proxyTo.host != null)
(concatMapStringsSep "\n" (hostname: ''
${" "}use-server ${hostname}-http if { req.hdr(host) -i ${hostname} }
${" "}server ${hostname}-http ${proxyHost.proxyTo.host}:${toString proxyHost.proxyTo.httpPort}
use-server ${hostname}-http if { req.hdr(host) -i ${hostname} }
server ${hostname}-http ${proxyHost.proxyTo.host}:${
toString proxyHost.proxyTo.httpPort
}
'') (proxyHost.hostNames))) (cfg.proxyHosts)
}
@ -113,13 +115,15 @@ in {
option http-server-close
http-request set-header X-Forwarded-Proto https
http-request set-header X-Forwarded-Port 443
${
${
concatMapStringsSep "\n" (proxyHost:
optionalString
(proxyHost.hostNames != [ ] && proxyHost.proxyTo.host != null)
(concatMapStringsSep "\n" (hostname: ''
${" "}use-server ${hostname}-https if { req_ssl_sni -i ${hostname} }
${" "}server ${hostname}-https ${proxyHost.proxyTo.host}:${toString proxyHost.proxyTo.httpsPort}
use-server ${hostname}-https if { req.ssl_sni -i ${hostname} }
server ${hostname}-https ${proxyHost.proxyTo.host}:${
toString proxyHost.proxyTo.httpsPort
}
'') (proxyHost.hostNames))) (cfg.proxyHosts)
}
'';