From 68961dc0775f5390c3bd44b9b0a8ac8f1d9f99a4 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Wed, 18 Dec 2024 02:02:08 +0800 Subject: [PATCH] hosts/reisen-lax0: disable matrix again --- nixos/hosts/reisen-lax0/default.nix | 2 +- nixos/hosts/reisen-lax0/matrix.nix | 74 +---------------------------- zones/rebmit.moe.nix | 2 +- 3 files changed, 4 insertions(+), 74 deletions(-) diff --git a/nixos/hosts/reisen-lax0/default.nix b/nixos/hosts/reisen-lax0/default.nix index 8461d9a..75ab11c 100644 --- a/nixos/hosts/reisen-lax0/default.nix +++ b/nixos/hosts/reisen-lax0/default.nix @@ -6,7 +6,7 @@ { imports = suites.server ++ (mylib.path.scanPaths ./. "default.nix"); - services.caddy.enable = true; + services.caddy.enable = false; system.stateVersion = "24.05"; } diff --git a/nixos/hosts/reisen-lax0/matrix.nix b/nixos/hosts/reisen-lax0/matrix.nix index ddca4b2..b06de7e 100644 --- a/nixos/hosts/reisen-lax0/matrix.nix +++ b/nixos/hosts/reisen-lax0/matrix.nix @@ -31,7 +31,6 @@ in sops.secrets."synapse/signing-key" = { sopsFile = config.sops.secretFiles.get "hosts/reisen-lax0.yaml"; - owner = config.systemd.services.matrix-synapse.serviceConfig.User; }; sops.secrets."synapse/mautrix-telegram" = { @@ -44,7 +43,7 @@ in ]; services.matrix-synapse = { - enable = true; + enable = false; withJemalloc = true; settings = { server_name = "rebmit.moe"; @@ -97,79 +96,10 @@ in }; }; - systemd.services.mautrix-telegram.serviceConfig.RuntimeMaxSec = 86400; - - services.mautrix-telegram = { - enable = true; - environmentFile = config.sops.secrets."synapse/mautrix-telegram".path; - serviceDependencies = [ "matrix-synapse.service" ]; - settings = { - homeserver = { - address = "http://127.0.0.1:8196"; - domain = config.services.matrix-synapse.settings.server_name; - }; - appservice = { - address = "http://127.0.0.1:29317"; - database = "postgres:///mautrix-telegram?host=/run/postgresql"; - hostname = "127.0.0.1"; - port = 29317; - provisioning.enabled = false; - }; - bridge = { - displayname_template = "{displayname}"; - public_portals = true; - delivery_error_reports = true; - incoming_bridge_error_reports = true; - bridge_matrix_leave = false; - relay_user_distinguishers = [ ]; - create_group_on_invite = false; - encryption = { - allow = true; - default = true; - }; - animated_sticker = { - target = "webp"; - convert_from_webm = true; - }; - state_event_formats = { - join = ""; - leave = ""; - name_change = ""; - }; - permissions = { - "*" = "relaybot"; - "@i:rebmit.moe" = "admin"; - }; - relaybot = { - authless_portals = false; - }; - }; - telegram = { - device_info = { - app_version = "3.5.2"; - }; - }; - logging = { - loggers = { - mau.level = "INFO"; - telethon.level = "INFO"; - }; - }; - }; - }; - - services.heisenbridge = { - enable = true; - homeserver = "http://127.0.0.1:8196"; - address = "127.0.0.1"; - port = 9898; - owner = "@i:rebmit.moe"; - }; - services.caddy = { virtualHosts."matrix.rebmit.moe".extraConfig = '' reverse_proxy /_matrix/* 127.0.0.1:8196 - reverse_proxy /_synapse/client/* 127.0.0.1:8196 + reverse_proxy /_synapse/* 127.0.0.1:8196 header { X-Frame-Options SAMEORIGIN diff --git a/zones/rebmit.moe.nix b/zones/rebmit.moe.nix index eb24a8c..54364b1 100644 --- a/zones/rebmit.moe.nix +++ b/zones/rebmit.moe.nix @@ -22,7 +22,7 @@ dns.lib.toString "rebmit.moe" { ]; subdomains = { keycloak.CNAME = [ "suwako-vie0.rebmit.link." ]; - matrix.CNAME = [ "reisen-lax0.rebmit.link." ]; + matrix.CNAME = [ "suwako-vie0.rebmit.link." ]; miniflux.CNAME = [ "suwako-vie0.rebmit.link." ]; ntfy.CNAME = [ "suwako-vie0.rebmit.link." ]; };