fix: continuwuity port forwarding

This commit is contained in:
Katharina Heidenreich 2026-03-16 18:47:04 +01:00
parent 8919152f67
commit ff30395864
2 changed files with 22 additions and 2 deletions

View file

@ -66,6 +66,19 @@ rec {
port = 6167; port = 6167;
ssl = true; ssl = true;
allowExternConnections = true; allowExternConnections = true;
listen = [
{
port = 80;
}
{
port = 443;
ssl = true;
}
{
port = 8448;
ssl = true;
}];
endpoints = ["/_matrix"];
}; };
domainOverride = "nudelerde.de"; domainOverride = "nudelerde.de";
}; };

View file

@ -21,11 +21,15 @@ let
myExtraConfig = if service.reverse_proxy ? extraConfig myExtraConfig = if service.reverse_proxy ? extraConfig
then service.reverse_proxy.extraConfig then service.reverse_proxy.extraConfig
else {}; else {};
listenConfig = if service.reverse_proxy ? listen
then service.reverse_proxy.listen
else if service.reverse_proxy ? ssl && service.reverse_proxy.ssl
then [ {port = 80;} {port = 443; ssl=true;} ]
else [ {port = 80;} ];
sslConfig = if service.reverse_proxy ? ssl && service.reverse_proxy.ssl sslConfig = if service.reverse_proxy ? ssl && service.reverse_proxy.ssl
then { then {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
listen = [ {addr = "0.0.0.0"; port = 80;} {addr = "0.0.0.0"; port = 443; ssl=true;} ];
} }
else {}; else {};
externConnections = if service.reverse_proxy ? allowExternConnections && service.reverse_proxy.allowExternConnections externConnections = if service.reverse_proxy ? allowExternConnections && service.reverse_proxy.allowExternConnections
@ -38,7 +42,10 @@ let
in in
{ {
serverName = "${domain}"; serverName = "${domain}";
listen = [ {addr = "0.0.0.0"; port = 80;} ]; listen = map (obj: ({
addr = if obj ? addr then obj.addr else "0.0.0.0";
port = obj.port;
} // (if obj ? ssl then {ssl = obj.ssl;} else {}))) listenConfig;
locations = locationsData; locations = locationsData;
extraConfig = '' extraConfig = ''
allow ${network.network.subnet}; allow ${network.network.subnet};