From 1e71d7fc3eb83df1e3a6a392eacc48f0ac8579e7 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Wed, 18 Dec 2024 20:24:46 +0800 Subject: [PATCH] services/matrix: drop synapse-admin --- nixos/hosts/flandre-m5p/networking.nix | 4 ++-- nixos/hosts/reisen-lax0/matrix.nix | 4 ++-- nixos/profiles/services/matrix/synapse.nix | 11 ++--------- zones/rebmit.moe.nix | 1 - 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/nixos/hosts/flandre-m5p/networking.nix b/nixos/hosts/flandre-m5p/networking.nix index e9e9902..c82a803 100644 --- a/nixos/hosts/flandre-m5p/networking.nix +++ b/nixos/hosts/flandre-m5p/networking.nix @@ -77,11 +77,11 @@ }; sops.secrets."wireguard/reimu-aston/private-key" = { - sopsFile = config.sops.secretFiles.get "hosts/flandre-m5p.yaml"; + sopsFile = config.sops.secretFiles.host; }; sops.secrets."wireguard/reimu-aston/preshared-key" = { - sopsFile = config.sops.secretFiles.get "hosts/flandre-m5p.yaml"; + sopsFile = config.sops.secretFiles.host; }; networking.wireguard = { diff --git a/nixos/hosts/reisen-lax0/matrix.nix b/nixos/hosts/reisen-lax0/matrix.nix index b06de7e..b76ccf1 100644 --- a/nixos/hosts/reisen-lax0/matrix.nix +++ b/nixos/hosts/reisen-lax0/matrix.nix @@ -30,11 +30,11 @@ in }; sops.secrets."synapse/signing-key" = { - sopsFile = config.sops.secretFiles.get "hosts/reisen-lax0.yaml"; + sopsFile = config.sops.secretFiles.host; }; sops.secrets."synapse/mautrix-telegram" = { - sopsFile = config.sops.secretFiles.get "hosts/reisen-lax0.yaml"; + sopsFile = config.sops.secretFiles.host; }; systemd.services.matrix-synapse.serviceConfig.LoadCredential = [ diff --git a/nixos/profiles/services/matrix/synapse.nix b/nixos/profiles/services/matrix/synapse.nix index 3bab6bf..4034d57 100644 --- a/nixos/profiles/services/matrix/synapse.nix +++ b/nixos/profiles/services/matrix/synapse.nix @@ -4,12 +4,12 @@ { config, pkgs, ... }: { sops.secrets."synapse/signing-key" = { - sopsFile = config.sops.secretFiles.get "hosts/suwako-vie0.yaml"; + sopsFile = config.sops.secretFiles.host; owner = config.systemd.services.matrix-synapse.serviceConfig.User; }; sops.secrets."synapse/oidc-client-secret" = { - sopsFile = config.sops.secretFiles.get "hosts/suwako-vie0.yaml"; + sopsFile = config.sops.secretFiles.host; owner = config.systemd.services.matrix-synapse.serviceConfig.User; }; @@ -100,11 +100,4 @@ }" ''; }; - - services.caddy.virtualHosts."synapse-admin.rebmit.moe" = { - extraConfig = '' - file_server - root * "${pkgs.synapse-admin}" - ''; - }; } diff --git a/zones/rebmit.moe.nix b/zones/rebmit.moe.nix index b64404d..54364b1 100644 --- a/zones/rebmit.moe.nix +++ b/zones/rebmit.moe.nix @@ -25,6 +25,5 @@ dns.lib.toString "rebmit.moe" { matrix.CNAME = [ "suwako-vie0.rebmit.link." ]; miniflux.CNAME = [ "suwako-vie0.rebmit.link." ]; ntfy.CNAME = [ "suwako-vie0.rebmit.link." ]; - synapse-admin.CNAME = [ "suwako-vie0.rebmit.link." ]; }; }