Merge branch 'zenix/master' into alpine/master
This commit is contained in:
commit
2c406b36d3
38 changed files with 843 additions and 360 deletions
|
|
@ -86,12 +86,6 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
services.matrix-sliding-sync = {
|
||||
enable = true;
|
||||
environmentFile = templates."synapse/sliding_sync_env".path;
|
||||
settings.SYNCV3_SERVER = "https://${domain}";
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts = {
|
||||
${domain} = {
|
||||
locations."= /.well-known/matrix/server".extraConfig = mkWellKnown {
|
||||
|
|
@ -99,7 +93,6 @@ in {
|
|||
};
|
||||
locations."= /.well-known/matrix/client".extraConfig = mkWellKnown {
|
||||
"m.homeserver".base_url = "https://${fqdn}";
|
||||
"org.matrix.msc3575.proxy"."url" = "https://${fqdn}";
|
||||
};
|
||||
locations."= /.well-known/matrix/support".extraConfig = mkWellKnown {
|
||||
admins = [
|
||||
|
|
@ -112,14 +105,12 @@ in {
|
|||
};
|
||||
locations."/_matrix".proxyPass = "http://localhost:${toString port}";
|
||||
locations."/_synapse/client".proxyPass = "http://localhost:${toString port}";
|
||||
locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://${toString matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
|
||||
};
|
||||
${fqdn} = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/_matrix".proxyPass = "http://localhost:${toString port}";
|
||||
locations."/_synapse/client".proxyPass = "http://localhost:${toString port}";
|
||||
locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://${toString matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue