diff --git a/modules/default.nix b/modules/default.nix index 58c08db..2d5a79b 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -18,7 +18,7 @@ in # ./discord-matrix-bridge.nix ./mastodon.nix ./nix_cache.nix - ./ooye.nix + ./ooye # ./auth.nix ./hedgedoc.nix # ./factorio.nix @@ -151,6 +151,11 @@ in host = "puffer.${domain}"; accessType = "proxy"; }; + ooye = { + port = 6693; + host = "ooye.${domain}"; + accessType = "proxy"; + }; hedgedoc_host = { port = 8048; host = "hedgedoc.${domain}"; diff --git a/modules/matrix.nix b/modules/matrix.nix index 6eac5e4..fdc4ba3 100644 --- a/modules/matrix.nix +++ b/modules/matrix.nix @@ -28,7 +28,7 @@ in workers.federationReceivers = 1; workers.initialSyncers = 1; workers.normalSyncers = 1; - workers.eventPersisters = 2; + workers.eventPersisters = 1; workers.useUserDirectoryWorker = true; mainLogConfig = ./matrix_synapse_log_config.yaml; @@ -38,7 +38,7 @@ in settings = { suppress_key_server_warning = true; server_name = domain; - public_baseurl = "https://${domain}"; + public_baseurl = "https://${vhosts.matrix_host.host}"; enable_registration = true; registration_requires_token = true; registration_shared_secret_path = config.age.secrets.synapse_registration_shared_secret.path; diff --git a/modules/ooye.nix b/modules/ooye.nix deleted file mode 100644 index 67a9dda..0000000 --- a/modules/ooye.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ ooye ]; -} diff --git a/modules/ooye/default.nix b/modules/ooye/default.nix new file mode 100644 index 0000000..9a70f30 --- /dev/null +++ b/modules/ooye/default.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ ooye ]; + + +services.matrix-synapse-next.settings.app_service_config_files = [ ./registration.yaml ]; +}