Revert "server: enable matrix-sliding-sync"
This reverts commit 5ba73e92a8
.
This commit is contained in:
parent
e13cd51c3b
commit
7e49323705
|
@ -283,13 +283,7 @@ in {
|
|||
job_name = "local_medium_freq";
|
||||
scrape_interval = "15m";
|
||||
static_configs = [ {
|
||||
targets = [
|
||||
"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
|
||||
];
|
||||
targets = [ "127.0.0.1:9548" "127.0.0.1:9198" "127.0.0.1:9173" ];
|
||||
labels.machine = "server";
|
||||
} ];
|
||||
}
|
||||
|
@ -373,9 +367,6 @@ in {
|
|||
host = "127.0.0.1";
|
||||
port = 9173;
|
||||
};
|
||||
services.matrix-sliding-sync = {
|
||||
settings.SYNCV3_PROM = "[::]:8011";
|
||||
};
|
||||
services.matrix-synapse.settings = {
|
||||
enable_metrics = true;
|
||||
federation_metrics_domains = [ "matrix.org" ];
|
||||
|
|
|
@ -11,7 +11,6 @@ let
|
|||
matrixClientJson = {
|
||||
"m.homeserver".base_url = "https://matrix.${cfg.domainName}";
|
||||
"m.identity_server".base_url = "https://vector.im";
|
||||
"org.matrix.msc3575.proxy".url = "https://matrix.${cfg.domainName}";
|
||||
};
|
||||
matrixServerConfigResponse = ''
|
||||
add_header Content-Type application/json;
|
||||
|
@ -42,8 +41,7 @@ in {
|
|||
locations = {
|
||||
"= /.well-known/matrix/server".extraConfig = matrixServerConfigResponse;
|
||||
"= /.well-known/matrix/client".extraConfig = matrixClientConfigResponse;
|
||||
"~ ^/(_matrix(?!/maubot)|_synapse/client|$)".proxyPass = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}";
|
||||
"~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/)".proxyPass = "http://${config.services.matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
|
||||
"/".proxyPass = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -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";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue