danio
/
nixos-matrix-modules
mirror of https://github.com/dali99/nixos-matrix-modules.git
1
1
Fork 0
Code Issues Releases Activity

sliding-sync: deprecate

This commit is contained in:
Daniel Lovbrotte Olsen 2024-09-27 05:54:58 +02:00
parent f4e20d0360
commit f8843835e2
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sliding-sync/default.nix
View File

@ -84,6 +84,15 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
warnings = lib.optionals config.services.matrix-synapse-next.enable [
''
services.matrix-synapse.sliding-sync is no longer necessary to use sliding-sync with synapse,
and the extra module will be removed from `nixos-matrix-modules` in the future.
If you are only using this service via `nixos-matrix-modules` you can safely remove options like
`services.matrix-synapse.sliding-sync.environmentFile`.
''
];
services.postgresql = lib.optionalAttrs cfg.createDatabase { services.postgresql = lib.optionalAttrs cfg.createDatabase {
enable = true; enable = true;
ensureDatabases = [ "matrix-sliding-sync" ]; ensureDatabases = [ "matrix-sliding-sync" ];

17
synapse-module/default.nix
View File

@ -395,6 +395,9 @@ in
message = "Some listeners are missing either a socket path or a bind_address + port to listen on"; message = "Some listeners are missing either a socket path or a bind_address + port to listen on";
}) cfg.settings.listeners); }) cfg.settings.listeners);
warnings = [ ] ++ lib.optional cfg.enableSlidingSync
"the option services.matrix-synapse-next.enableSlidingSync no longer has any effect (and is enabled by default)";
users.users.matrix-synapse = { users.users.matrix-synapse = {
group = "matrix-synapse"; group = "matrix-synapse";
home = cfg.dataDir; home = cfg.dataDir;
@ -452,19 +455,5 @@ in
}; };
}; };
}; };
services.matrix-synapse-next.settings.extra_well_known_client_content."org.matrix.msc3575.proxy" = mkIf cfg.enableSlidingSync {
url = "https://${config.services.matrix-synapse.sliding-sync.publicBaseUrl}";
};
services.matrix-synapse.sliding-sync = mkIf cfg.enableSlidingSync {
enable = true;
enableNginx = lib.mkDefault cfg.enableNginx;
publicBaseUrl = lib.mkDefault "slidingsync.${cfg.settings.server_name}";
settings = {
SYNCV3_SERVER = lib.mkDefault "https://${cfg.public_baseurl}";
SYNCV3_PROM = lib.mkIf cfg.settings.enable_metrics (lib.mkDefault "127.0.0.1:9001");
};
};
}; };
} }