From f8de2447719bfd9de4496927d4c6b14112829868 Mon Sep 17 00:00:00 2001
From: Lu Wang <rebmit@rebmit.moe>
Date: Wed, 18 Dec 2024 01:22:01 +0800
Subject: [PATCH] Revert "hosts/reisen-lax0: disable matrix"

This reverts commit c8ed51df7a54516ea6b21efbe7eeefe6dee1dbe3.
---
 nixos/hosts/reisen-lax0/default.nix | 10 +---------
 nixos/hosts/reisen-lax0/matrix.nix  |  7 ++++---
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/nixos/hosts/reisen-lax0/default.nix b/nixos/hosts/reisen-lax0/default.nix
index ed402fb..8461d9a 100644
--- a/nixos/hosts/reisen-lax0/default.nix
+++ b/nixos/hosts/reisen-lax0/default.nix
@@ -6,15 +6,7 @@
 {
   imports = suites.server ++ (mylib.path.scanPaths ./. "default.nix");
 
-  services.caddy = {
-    enable = false;
-    virtualHosts."rebmit.moe".extraConfig = ''
-      header /.well-known/matrix/* Content-Type application/json
-      header /.well-known/matrix/* Access-Control-Allow-Origin *
-      respond /.well-known/matrix/server `{"m.server": "matrix.rebmit.moe:443"}`
-      respond /.well-known/matrix/client `{"m.homeserver":{"base_url":"https://matrix.rebmit.moe"}}`
-    '';
-  };
+  services.caddy.enable = true;
 
   system.stateVersion = "24.05";
 }
diff --git a/nixos/hosts/reisen-lax0/matrix.nix b/nixos/hosts/reisen-lax0/matrix.nix
index bcb0a8b..ddca4b2 100644
--- a/nixos/hosts/reisen-lax0/matrix.nix
+++ b/nixos/hosts/reisen-lax0/matrix.nix
@@ -31,6 +31,7 @@ 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" = {
@@ -43,7 +44,7 @@ in
   ];
 
   services.matrix-synapse = {
-    enable = false;
+    enable = true;
     withJemalloc = true;
     settings = {
       server_name = "rebmit.moe";
@@ -99,7 +100,7 @@ in
   systemd.services.mautrix-telegram.serviceConfig.RuntimeMaxSec = 86400;
 
   services.mautrix-telegram = {
-    enable = false;
+    enable = true;
     environmentFile = config.sops.secrets."synapse/mautrix-telegram".path;
     serviceDependencies = [ "matrix-synapse.service" ];
     settings = {
@@ -158,7 +159,7 @@ in
   };
 
   services.heisenbridge = {
-    enable = false;
+    enable = true;
     homeserver = "http://127.0.0.1:8196";
     address = "127.0.0.1";
     port = 9898;