chayleaf/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "server: enable matrix-sliding-sync"

Browse source 
This reverts commit 5ba73e92a8.
This commit is contained in:
chayleaf 2024-11-24 11:17:18 +07:00
parent e13cd51c3b
commit 7e49323705
Signed by: chayleaf
GPG key ID: 78171AD46227E68E
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
system/hosts/server/home.nix
View file

@ -283,13 +283,7 @@ in {
job_name = "local_medium_freq"; job_name = "local_medium_freq";
scrape_interval = "15m"; scrape_interval = "15m";
static_configs = [ { static_configs = [ {
targets = [ targets = [ "127.0.0.1:9548" "127.0.0.1:9198" "127.0.0.1:9173" ];
"127.0.0.1:9548"
"127.0.0.1:9198"
(let cfg = config.services.matrix-appservice-discord.settings.metrics;
in "${lib.quoteListenAddr cfg.host}:${toString cfg.port}")
config.services.matrix-sliding-sync.settings.SYNCV3_PROM
];
labels.machine = "server"; labels.machine = "server";
} ]; } ];
} }
@ -373,9 +367,6 @@ in {
host = "127.0.0.1"; host = "127.0.0.1";
port = 9173; port = 9173;
}; };
services.matrix-sliding-sync = {
settings.SYNCV3_PROM = "[::]:8011";
};
services.matrix-synapse.settings = { services.matrix-synapse.settings = {
enable_metrics = true; enable_metrics = true;
federation_metrics_domains = [ "matrix.org" ]; federation_metrics_domains = [ "matrix.org" ];

13
system/hosts/server/matrix.nix
View file

@ -11,7 +11,6 @@ let
matrixClientJson = { matrixClientJson = {
"m.homeserver".base_url = "https://matrix.${cfg.domainName}"; "m.homeserver".base_url = "https://matrix.${cfg.domainName}";
"m.identity_server".base_url = "https://vector.im"; "m.identity_server".base_url = "https://vector.im";
"org.matrix.msc3575.proxy".url = "https://matrix.${cfg.domainName}";
}; };
matrixServerConfigResponse = '' matrixServerConfigResponse = ''
add_header Content-Type application/json; add_header Content-Type application/json;
@ -42,8 +41,7 @@ in {
locations = { locations = {
"= /.well-known/matrix/server".extraConfig = matrixServerConfigResponse; "= /.well-known/matrix/server".extraConfig = matrixServerConfigResponse;
"= /.well-known/matrix/client".extraConfig = matrixClientConfigResponse; "= /.well-known/matrix/client".extraConfig = matrixClientConfigResponse;
"~ ^/(_matrix(?!/maubot)|_synapse/client|$)".proxyPass = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}"; "/".proxyPass = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}";
"~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/)".proxyPass = "http://${config.services.matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
}; };
}; };
@ -114,13 +112,4 @@ in {
}]; }];
}; };
}; };
services.matrix-sliding-sync = {
enable = true;
environmentFile = "/secrets/sliding-sync/env";
settings = {
SYNCV3_BINDADDR = "[::]:8010";
SYNCV3_SERVER = "https://matrix.pavluk.org";
};
};
} }