pub-solar/infra
6
1
Fork 3
Code Issues 20 Pull requests 9 Actions Packages Projects 1 Releases Wiki Activity

matrix-authentication-service: init, test, migrate synapse #250

Merged
teutat3s merged 11 commits from mas-init into main 2024-10-30 20:02:54 +00:00
Conversation 1 Commits 11 Files changed 22 +5 -8
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 041d311bb2 - Show all commits

3
hosts/nachtigall/configuration.nix
View file

@ -63,21 +63,18 @@
# matrix-synapse # matrix-synapse
age.secrets."matrix-synapse-signing-key" = { age.secrets."matrix-synapse-signing-key" = {
file = "${flake.self}/secrets/matrix-synapse-signing-key.age"; file = "${flake.self}/secrets/matrix-synapse-signing-key.age";
path = "/run/agenix/matrix-synapse-signing-key";
mode = "400"; mode = "400";
owner = "matrix-synapse"; owner = "matrix-synapse";
}; };
age.secrets."matrix-synapse-secret-config.yaml" = { age.secrets."matrix-synapse-secret-config.yaml" = {
file = "${flake.self}/secrets/matrix-synapse-secret-config.yaml.age"; file = "${flake.self}/secrets/matrix-synapse-secret-config.yaml.age";
path = "/run/agenix/matrix-synapse-secret-config.yaml";
mode = "400"; mode = "400";
owner = "matrix-synapse"; owner = "matrix-synapse";
}; };
age.secrets."matrix-synapse-sliding-sync-secret" = { age.secrets."matrix-synapse-sliding-sync-secret" = {
file = "${flake.self}/secrets/matrix-synapse-sliding-sync-secret.age"; file = "${flake.self}/secrets/matrix-synapse-sliding-sync-secret.age";
path = "/run/agenix/matrix-synapse-sliding-sync-secret";
mode = "400"; mode = "400";
owner = "matrix-synapse"; owner = "matrix-synapse";
}; };

10
modules/matrix/default.nix
View file

@ -217,7 +217,7 @@ in
} }
]; ];
signing_key_path = config.pub-solar-os.matrix-synapse.signing_key_path; signing_key_path = config.pub-solar-os.matrix.synapse.signing_key_path;
stream_writers = { }; stream_writers = { };
trusted_key_servers = [ { server_name = "matrix.org"; } ]; trusted_key_servers = [ { server_name = "matrix.org"; } ];
@ -263,12 +263,12 @@ in
}; };
user_ips_max_age = "28d"; user_ips_max_age = "28d";
app_service_config_files = config.pub-solar-os.matrix-synapse.app-service-config-files; app_service_config_files = config.pub-solar-os.matrix.synapse.app-service-config-files;
}; };
withJemalloc = true; withJemalloc = true;
extraConfigFiles = config.pub-solar-os.matrix-synapse.extra-config-files; extraConfigFiles = config.pub-solar-os.matrix.synapse.extra-config-files;
extras = [ extras = [
"oidc" "oidc"
@ -327,7 +327,7 @@ in
}; };
services.matrix-sliding-sync = { services.matrix-sliding-sync = {
enable = config.pub-solar-os.matrix-synapse.sliding-sync.enable; enable = config.pub-solar-os.matrix.synapse.sliding-sync.enable;
settings = { settings = {
SYNCV3_SERVER = "https://${publicDomain}"; SYNCV3_SERVER = "https://${publicDomain}";
SYNCV3_BINDADDR = "127.0.0.1:8011"; SYNCV3_BINDADDR = "127.0.0.1:8011";
@ -335,7 +335,7 @@ in
# /metrics at this address # /metrics at this address
SYNCV3_PROM = "127.0.0.1:9100"; SYNCV3_PROM = "127.0.0.1:9100";
}; };
environmentFile = config.age.secrets."nachtigall-matrix-synapse-sliding-sync-secret".path; environmentFile = config.age.secrets."matrix-synapse-sliding-sync-secret".path;
}; };
pub-solar-os.backups.restic.matrix-synapse = { pub-solar-os.backups.restic.matrix-synapse = {