feat: fix nginx and matrix config
This commit is contained in:
parent
4863ab05f5
commit
d5254af7dd
3 changed files with 9 additions and 2 deletions
|
|
@ -17,5 +17,8 @@ rec {
|
||||||
"https://download.kiwix.org/zim/wikipedia/wikipedia_de_all_nopic_2026-01.zim"
|
"https://download.kiwix.org/zim/wikipedia/wikipedia_de_all_nopic_2026-01.zim"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
matrix = {
|
||||||
|
trusted_servers = [ "matrix.org" ];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ in
|
||||||
allow_encryption = true;
|
allow_encryption = true;
|
||||||
allow_federation = true;
|
allow_federation = true;
|
||||||
max_request_size = 20 * 1024 * 1024; # 20 MiB
|
max_request_size = 20 * 1024 * 1024; # 20 MiB
|
||||||
|
trusted_servers = serv.matrix.trusted_servers;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,9 @@ let
|
||||||
serverAlias = lib.optionalAttrs (service.reverse_proxy.aliases != null) {
|
serverAlias = lib.optionalAttrs (service.reverse_proxy.aliases != null) {
|
||||||
serverAliases = map (alias: "${alias}.${domain}") service.reverse_proxy.aliases;
|
serverAliases = map (alias: "${alias}.${domain}") service.reverse_proxy.aliases;
|
||||||
};
|
};
|
||||||
|
myExtraConfig = if service.reverse_proxy.extraConfig != null
|
||||||
|
then service.reverse_proxy.extraConfig
|
||||||
|
else {};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
serverName = "${domain}";
|
serverName = "${domain}";
|
||||||
|
|
@ -27,7 +30,7 @@ let
|
||||||
allow ${network.network.subnet};
|
allow ${network.network.subnet};
|
||||||
deny all;
|
deny all;
|
||||||
'';
|
'';
|
||||||
} // serverAlias;
|
} // serverAlias // myExtraConfig;
|
||||||
rproxyServices = builtins.mapAttrs (virtualHostFn) network.reverse_proxy;
|
rproxyServices = builtins.mapAttrs (virtualHostFn) network.reverse_proxy;
|
||||||
serviceNamesMessage = builtins.toString (builtins.attrNames network.reverse_proxy);
|
serviceNamesMessage = builtins.toString (builtins.attrNames network.reverse_proxy);
|
||||||
fallback = {
|
fallback = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue