switch to synapse away from conduit
Some checks failed
Test action / kaas (push) Failing after 1s

This commit is contained in:
Chris Kruining 2025-09-11 16:43:54 +02:00
parent d4eff47049
commit d74f67e4fb
No known key found for this signature in database
GPG key ID: EB894A3560CCCAD2
2 changed files with 120 additions and 26 deletions

View file

@ -4,8 +4,7 @@ let
cfg = config.${namespace}.services.authentication.zitadel;
db_name = "zitadel";
db_user = "zitadel";
database = "zitadel";
in
{
options.${namespace}.services.authentication.zitadel = {
@ -72,9 +71,9 @@ in
Host = "localhost";
# Zitadel will report error if port is not set
Port = 5432;
Database = db_name;
Database = database;
User = {
Username = db_user;
Username = database;
SSL.Mode = "disable";
};
Admin = {
@ -105,10 +104,10 @@ in
postgresql = {
enable = true;
ensureDatabases = [ db_name ];
ensureDatabases = [ database ];
ensureUsers = [
{
name = db_user;
name = database;
ensureDBOwnership = true;
}
];

View file

@ -1,9 +1,15 @@
{ config, lib, pkgs, namespace, ... }:
let
inherit (builtins) toString toJSON;
inherit (lib) mkIf mkEnableOption;
cfg = config.${namespace}.services.communication.conduit;
domain = "matrix.kruining.eu";
domain = "kruining.eu";
fqn = "matrix.${domain}";
port = 4001;
database = "synapse";
in
{
options.${namespace}.services.communication.conduit = {
@ -20,13 +26,13 @@ in
services = {
matrix-conduit = {
enable = true;
enable = false;
settings.global = {
address = "::";
port = 4001;
port = port;
server_name = "matrix.kruining.eu";
server_name = domain;
database_backend = "rocksdb";
# database_path = "/var/lib/matrix-conduit/";
@ -38,27 +44,115 @@ in
};
};
# postgresql = {
# enable = true;
# ensureDatabases = [ "conduit" ];
# ensureUsers = [
# {
# name = "conduit";
# ensureDBOwnership = true;
# }
# ];
# };
matrix-synapse = {
enable = true;
extras = [ "oidc" ];
plugins = with config.services.matrix-synapse.package.plugins; [];
settings = {
server_name = domain;
public_baseurl = "https://${fqn}";
enable_registration = false;
registration_shared_secret = "tZtBnlhEmLbMwF0lQ112VH1Rl5MkZzYH9suI4pEoPXzk6nWUB8FJF4eEnwLkbstz";
url_preview_enabled = true;
precence.enabled = true;
database = {
# this is postgresql (also the default, but I prefer to be explicit)
name = "psycopg2";
args = {
database = database;
user = database;
};
};
listeners = [
{
bind_addresses = ["::"];
port = port;
type = "http";
tls = false;
x_forwarded = true;
resources = [
{
names = [ "client" "federation" ];
compress = true;
}
];
}
];
};
};
mautrix-signal = {
enable = true;
registerToSynapse = true;
settings = {
appservice = {
provisioning.enabled = false;
port = 40011;
};
homeserver = {
address = "http://[::1]:${toString port}";
domain = domain;
};
bridge = {
permissions = {
"@chris:${domain}" = "admin";
};
};
};
};
mautrix-whatsapp = {
enable = true;
registerToSynapse = true;
settings = {
appservice = {
provisioning.enabled = false;
port = 40012;
};
homeserver = {
address = "http://[::1]:${toString port}";
domain = domain;
};
bridge = {
permissions = {
"@chris:${domain}" = "admin";
};
};
};
};
postgresql = {
enable = true;
ensureDatabases = [ database ];
ensureUsers = [
{
name = database;
ensureDBOwnership = true;
}
];
};
caddy = {
enable = true;
virtualHosts = let
inherit (builtins) toJSON;
server = {
"m.server" = "${domain}:443";
"m.server" = "${fqn}:443";
};
client = {
"m.homeserver".base_url = "https://${domain}";
"m.homeserver".base_url = "https://${fqn}";
"m.identity_server".base_url = "https://auth.amarth.cloud";
};
in {
@ -67,9 +161,10 @@ in
header /.well-known/matrix/* Access-Control-Allow-Origin *
respond /.well-known/matrix/server `${toJSON server}`
respond /.well-known/matrix/client `${toJSON client}`
'';
"${fqn}".extraConfig = ''
reverse_proxy /_matrix/* http://::1:4001
# reverse_proxy /_synapse/client/* http://::1:4001
reverse_proxy /_synapse/client/* http://::1:4001
'';
};
};