From 4b18856559495858d98c3cefb8cafd8020ca67e7 Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 31 Jul 2023 16:43:30 +0200 Subject: [PATCH] Use hacky workaround for enableACME check with a proxyProtocol listener --- hosts/web-public-2/virtualHosts/anisync.grzb.de.nix | 8 ++++---- .../web-public-2/virtualHosts/birdsite.nekover.se.nix | 8 ++++---- hosts/web-public-2/virtualHosts/element.nekover.se.nix | 4 ++-- hosts/web-public-2/virtualHosts/gameserver.grzb.de.nix | 8 ++++---- hosts/web-public-2/virtualHosts/git.grzb.de.nix | 8 ++++---- hosts/web-public-2/virtualHosts/mewtube.nekover.se.nix | 8 ++++---- hosts/web-public-2/virtualHosts/nekover.se.nix | 8 ++++---- hosts/web-public-2/virtualHosts/nextcloud.grzb.de.nix | 10 ++++++---- hosts/web-public-2/virtualHosts/social.nekover.se.nix | 8 ++++---- 9 files changed, 36 insertions(+), 34 deletions(-) diff --git a/hosts/web-public-2/virtualHosts/anisync.grzb.de.nix b/hosts/web-public-2/virtualHosts/anisync.grzb.de.nix index 6ccc410..b628ef7 100644 --- a/hosts/web-public-2/virtualHosts/anisync.grzb.de.nix +++ b/hosts/web-public-2/virtualHosts/anisync.grzb.de.nix @@ -4,10 +4,10 @@ forceSSL = true; enableACME = true; listen = [ - { - addr = "0.0.0.0"; - port = 80; - } + { + addr = "localhost"; + port = 1234; + } # workaround for enableACME check { addr = "localhost"; port = 8443; diff --git a/hosts/web-public-2/virtualHosts/birdsite.nekover.se.nix b/hosts/web-public-2/virtualHosts/birdsite.nekover.se.nix index 1bf6ec5..a043d8e 100644 --- a/hosts/web-public-2/virtualHosts/birdsite.nekover.se.nix +++ b/hosts/web-public-2/virtualHosts/birdsite.nekover.se.nix @@ -4,10 +4,10 @@ forceSSL = true; enableACME = true; listen = [ - { - addr = "0.0.0.0"; - port = 80; - } + { + addr = "localhost"; + port = 1234; + } # workaround for enableACME check { addr = "localhost"; port = 8443; diff --git a/hosts/web-public-2/virtualHosts/element.nekover.se.nix b/hosts/web-public-2/virtualHosts/element.nekover.se.nix index c4fdb27..de1665b 100644 --- a/hosts/web-public-2/virtualHosts/element.nekover.se.nix +++ b/hosts/web-public-2/virtualHosts/element.nekover.se.nix @@ -17,10 +17,10 @@ in ]; }; listen = [ - { + { addr = "localhost"; port = 1234; - } + } # workaround for enableACME check { addr = "localhost"; port = 8443; diff --git a/hosts/web-public-2/virtualHosts/gameserver.grzb.de.nix b/hosts/web-public-2/virtualHosts/gameserver.grzb.de.nix index ddb1332..5070a0b 100644 --- a/hosts/web-public-2/virtualHosts/gameserver.grzb.de.nix +++ b/hosts/web-public-2/virtualHosts/gameserver.grzb.de.nix @@ -4,10 +4,10 @@ forceSSL = true; enableACME = true; listen = [ - { - addr = "0.0.0.0"; - port = 80; - } + { + addr = "localhost"; + port = 1234; + } # workaround for enableACME check { addr = "localhost"; port = 8443; diff --git a/hosts/web-public-2/virtualHosts/git.grzb.de.nix b/hosts/web-public-2/virtualHosts/git.grzb.de.nix index 554421a..fb156d8 100644 --- a/hosts/web-public-2/virtualHosts/git.grzb.de.nix +++ b/hosts/web-public-2/virtualHosts/git.grzb.de.nix @@ -4,10 +4,10 @@ forceSSL = true; enableACME = true; listen = [ - { - addr = "0.0.0.0"; - port = 80; - } + { + addr = "localhost"; + port = 1234; + } # workaround for enableACME check { addr = "localhost"; port = 8443; diff --git a/hosts/web-public-2/virtualHosts/mewtube.nekover.se.nix b/hosts/web-public-2/virtualHosts/mewtube.nekover.se.nix index 835cb35..fbc64fa 100644 --- a/hosts/web-public-2/virtualHosts/mewtube.nekover.se.nix +++ b/hosts/web-public-2/virtualHosts/mewtube.nekover.se.nix @@ -4,10 +4,10 @@ forceSSL = true; enableACME = true; listen = [ - { - addr = "0.0.0.0"; - port = 80; - } + { + addr = "localhost"; + port = 1234; + } # workaround for enableACME check { addr = "localhost"; port = 8443; diff --git a/hosts/web-public-2/virtualHosts/nekover.se.nix b/hosts/web-public-2/virtualHosts/nekover.se.nix index 58847cd..743135d 100644 --- a/hosts/web-public-2/virtualHosts/nekover.se.nix +++ b/hosts/web-public-2/virtualHosts/nekover.se.nix @@ -4,10 +4,10 @@ forceSSL = true; enableACME = true; listen = [ - { - addr = "0.0.0.0"; - port = 80; - } + { + addr = "localhost"; + port = 1234; + } # workaround for enableACME check { addr = "localhost"; port = 8443; diff --git a/hosts/web-public-2/virtualHosts/nextcloud.grzb.de.nix b/hosts/web-public-2/virtualHosts/nextcloud.grzb.de.nix index 7a3f7d2..87fcc68 100644 --- a/hosts/web-public-2/virtualHosts/nextcloud.grzb.de.nix +++ b/hosts/web-public-2/virtualHosts/nextcloud.grzb.de.nix @@ -3,10 +3,12 @@ services.nginx.virtualHosts."nextcloud.grzb.de" = { forceSSL = true; enableACME = true; - listen = [ { - addr = "0.0.0.0"; - port = 80; - }{ + listen = [ + { + addr = "localhost"; + port = 1234; + } # workaround for enableACME check + { addr = "localhost"; port = 8443; ssl = true; diff --git a/hosts/web-public-2/virtualHosts/social.nekover.se.nix b/hosts/web-public-2/virtualHosts/social.nekover.se.nix index 5024b8f..2c44a16 100644 --- a/hosts/web-public-2/virtualHosts/social.nekover.se.nix +++ b/hosts/web-public-2/virtualHosts/social.nekover.se.nix @@ -4,10 +4,10 @@ forceSSL = true; enableACME = true; listen = [ - { - addr = "0.0.0.0"; - port = 80; - } + { + addr = "localhost"; + port = 1234; + } # workaround for enableACME check { addr = "localhost"; port = 8443;