From 8240f7dc32365d6a9c1c0a63693afa7f96a3433d Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 14 Jul 2021 17:40:49 +0200
Subject: [PATCH] Revert "public-access-proxy: fix haproxy config indentation"

This reverts commit 9168f2758504dd287c8002e6417a685c3520f5e0.

Not required as per http://cbonte.github.io/haproxy-dconv/2.3/configuration.html#2.1
---
 hosts/containers/public-access-proxy/proxy.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/hosts/containers/public-access-proxy/proxy.nix b/hosts/containers/public-access-proxy/proxy.nix
index c5dfa86a..8f035fc4 100644
--- a/hosts/containers/public-access-proxy/proxy.nix
+++ b/hosts/containers/public-access-proxy/proxy.nix
@@ -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)
           }
       '';