service urls carry no gateway port, httpsPort is listen-only
This commit is contained in:
parent
4d9b7e0ca9
commit
19680a8b78
25 changed files with 105 additions and 143 deletions
|
|
@ -23,12 +23,7 @@ let
|
|||
gatewayCfg = hyperhiveCfg.gateway;
|
||||
matrixCfg = hyperhiveCfg.swarm.matrix;
|
||||
|
||||
publicPort = gatewayCfg.httpsPort;
|
||||
# The canonical 443 elides the port; see `docs/networking/gateway.md`
|
||||
# ("Self-signed TLS").
|
||||
homeserverUrl = "https://${matrixCfg.gatewayHost}${
|
||||
lib.optionalString (publicPort != 443) ":${toString publicPort}"
|
||||
}";
|
||||
homeserverUrl = "https://${matrixCfg.gatewayHost}";
|
||||
in
|
||||
{
|
||||
config =
|
||||
|
|
@ -73,7 +68,7 @@ in
|
|||
"= /.well-known/matrix/server" = {
|
||||
extraConfig = ''
|
||||
default_type application/json;
|
||||
return 200 '{"m.server":"${matrixCfg.gatewayHost}:${toString publicPort}"}';
|
||||
return 200 '{"m.server":"${matrixCfg.gatewayHost}:443"}';
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue