diff --git a/config/hosts/valkyrie/configuration.nix b/config/hosts/valkyrie/configuration.nix index fd3cd45..f4e2db5 100644 --- a/config/hosts/valkyrie/configuration.nix +++ b/config/hosts/valkyrie/configuration.nix @@ -80,11 +80,6 @@ proto = "tcp"; sourcePort = 25; } - { - destination = "172.18.50.2:80"; - proto = "tcp"; - sourcePort = 80; - } { destination = "172.18.50.2:465"; proto = "tcp"; diff --git a/config/hosts/valkyrie/nginx.nix b/config/hosts/valkyrie/nginx.nix index ada3379..fae78f0 100644 --- a/config/hosts/valkyrie/nginx.nix +++ b/config/hosts/valkyrie/nginx.nix @@ -2,23 +2,35 @@ { services.nginx = { enable = true; - virtualHosts."status.nekover.se" = { - forceSSL = true; - enableACME = true; - listen = [ - { + virtualHosts = { + "mail-1.grzb.de" = { + listen = [{ addr = "0.0.0.0"; port = 80; - } - { - addr = "0.0.0.0"; - port = 443; - ssl = true; - } - ]; - locations."/" = { - proxyPass = "http://localhost:3001"; - proxyWebsockets = true; + }]; + locations."/" = { + # proxy port 80 to mail server nginx for acme http challange + proxyPass = "http://172.18.50.2:80"; + }; + }; + "status.nekover.se" = { + forceSSL = true; + enableACME = true; + listen = [ + { + addr = "0.0.0.0"; + port = 80; + } + { + addr = "0.0.0.0"; + port = 443; + ssl = true; + } + ]; + locations."/" = { + proxyPass = "http://localhost:3001"; + proxyWebsockets = true; + }; }; }; };