From 8a917e5aeca387a054d8875a7cbcb61dcd5ede64 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Tue, 4 Mar 2025 17:24:48 -0500
Subject: [PATCH] Update Matrix URL

---
 .../server/socialserver/mastodon/default.nix  |  4 +---
 .../socialserver/matrix/element/default.nix   |  4 ++--
 .../socialserver/matrix/synapse/default.nix   | 10 ++++-----
 .../matrix/synapse/nginx/default.nix          |  2 +-
 .../webserver/nginx/virtualhosts/default.nix  |  2 +-
 .../nginx/virtualhosts/files/default.nix      |  8 +++++++
 .../virtualhosts/jimbosfiles/default.nix      | 21 -------------------
 .../nginx/virtualhosts/nixfox/default.nix     | 13 ++++++++++++
 8 files changed, 30 insertions(+), 34 deletions(-)
 create mode 100644 modules/system/services/server/webserver/nginx/virtualhosts/files/default.nix
 delete mode 100644 modules/system/services/server/webserver/nginx/virtualhosts/jimbosfiles/default.nix

diff --git a/modules/system/services/server/socialserver/mastodon/default.nix b/modules/system/services/server/socialserver/mastodon/default.nix
index 193fe26..3006bf5 100644
--- a/modules/system/services/server/socialserver/mastodon/default.nix
+++ b/modules/system/services/server/socialserver/mastodon/default.nix
@@ -16,8 +16,6 @@
         passwordFile = pkgs.writeText "smtp_pass.txt" config.secrets.noreplyPassword;
       };
     };
-    environment.persistence."/persist".directories = [
-      "/var/lib/mastodon"
-    ];
+    environment.persistence."/persist".directories = [ "/var/lib/mastodon" ];
   };
 }
diff --git a/modules/system/services/server/socialserver/matrix/element/default.nix b/modules/system/services/server/socialserver/matrix/element/default.nix
index d8130a4..68b5b83 100644
--- a/modules/system/services/server/socialserver/matrix/element/default.nix
+++ b/modules/system/services/server/socialserver/matrix/element/default.nix
@@ -5,8 +5,8 @@
   config = lib.mkIf config.services.matrix-synapse.enable {
     nixpkgs.config.element-web.conf = {
       default_server_config."m.homeserver" = {
-        base_url = "https://matrix.jimbosfiles.com";
-        server_name = "matrix.jimbosfiles.com";
+        base_url = "https://matrix.nixfox.ca";
+        server_name = "matrix.nixfox.ca";
       };
       branding = {
         auth_header_logo_url = "https://www.nixfox.ca/images/copyright/profile.png";
diff --git a/modules/system/services/server/socialserver/matrix/synapse/default.nix b/modules/system/services/server/socialserver/matrix/synapse/default.nix
index e10d9b0..323146c 100644
--- a/modules/system/services/server/socialserver/matrix/synapse/default.nix
+++ b/modules/system/services/server/socialserver/matrix/synapse/default.nix
@@ -1,15 +1,13 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 {
-  imports = [
-    ./nginx
-  ];
+  imports = [ ./nginx ];
 
   config = lib.mkIf config.system.socialserver.enable {
     services.matrix-synapse = {
       enable = true;
       settings = {
-        server_name = "jimbosfiles.com";
-        public_baseurl = "https://matrix.jimbosfiles.com";
+        server_name = "nixfox.ca";
+        public_baseurl = "https://matrix.nixfox.ca";
         suppress_key_server_warning = true;
 
         # Email notifications about account status
diff --git a/modules/system/services/server/socialserver/matrix/synapse/nginx/default.nix b/modules/system/services/server/socialserver/matrix/synapse/nginx/default.nix
index f326cbc..c5d9d5f 100644
--- a/modules/system/services/server/socialserver/matrix/synapse/nginx/default.nix
+++ b/modules/system/services/server/socialserver/matrix/synapse/nginx/default.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 {
-  services.nginx.virtualHosts."matrix.jimbosfiles.com" = lib.mkIf config.services.matrix-synapse.enable {
+  services.nginx.virtualHosts."matrix.nixfox.ca" = lib.mkIf config.services.matrix-synapse.enable {
     enableACME = true;
     forceSSL = true;
     locations = {
diff --git a/modules/system/services/server/webserver/nginx/virtualhosts/default.nix b/modules/system/services/server/webserver/nginx/virtualhosts/default.nix
index ffe0d77..00d8b57 100644
--- a/modules/system/services/server/webserver/nginx/virtualhosts/default.nix
+++ b/modules/system/services/server/webserver/nginx/virtualhosts/default.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
+    ./files
     ./nixfox
-    ./jimbosfiles
   ];
 }
diff --git a/modules/system/services/server/webserver/nginx/virtualhosts/files/default.nix b/modules/system/services/server/webserver/nginx/virtualhosts/files/default.nix
new file mode 100644
index 0000000..3269f0d
--- /dev/null
+++ b/modules/system/services/server/webserver/nginx/virtualhosts/files/default.nix
@@ -0,0 +1,8 @@
+{ config, lib, ... }:
+{
+  services.nginx.virtualHosts."jimbosfiles.com" = lib.mkIf config.system.server.enable {
+    enableACME = true;
+    addSSL = true;
+    globalRedirect = "www.nixfox.ca";
+  };
+}
diff --git a/modules/system/services/server/webserver/nginx/virtualhosts/jimbosfiles/default.nix b/modules/system/services/server/webserver/nginx/virtualhosts/jimbosfiles/default.nix
deleted file mode 100644
index 426e2bb..0000000
--- a/modules/system/services/server/webserver/nginx/virtualhosts/jimbosfiles/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, lib, ... }:
-{
-  services.nginx.virtualHosts."jimbosfiles.com" = lib.mkIf config.system.server.enable {
-    enableACME = true;
-    addSSL = true;
-    globalRedirect = "www.nixfox.ca";
-    locations = {
-      "/.well-known/matrix/client".extraConfig = ''
-        default_type application/json;
-        return 200 '{
-          "m.homeserver": { "base_url": "https://matrix.jimbosfiles.com" },
-          "m.identity_server": { "base_url": "https://matrix.org" }
-        }';
-      '';
-      "/.well-known/matrix/server".extraConfig = ''
-        default_type application/json;
-        return 200 '{ "m.server": "matrix.jimbosfiles.com:443" }';
-      '';
-    };
-  };
-}
diff --git a/modules/system/services/server/webserver/nginx/virtualhosts/nixfox/default.nix b/modules/system/services/server/webserver/nginx/virtualhosts/nixfox/default.nix
index 8a93ae5..7bb75a2 100644
--- a/modules/system/services/server/webserver/nginx/virtualhosts/nixfox/default.nix
+++ b/modules/system/services/server/webserver/nginx/virtualhosts/nixfox/default.nix
@@ -11,6 +11,19 @@
       enableACME = true;
       addSSL = true;
       globalRedirect = "www.nixfox.ca";
+      locations = {
+        "/.well-known/matrix/client".extraConfig = ''
+          default_type application/json;
+          return 200 '{
+            "m.homeserver": { "base_url": "https://matrix.nixfox.ca" },
+            "m.identity_server": { "base_url": "https://matrix.org" }
+          }';
+        '';
+        "/.well-known/matrix/server".extraConfig = ''
+          default_type application/json;
+          return 200 '{ "m.server": "matrix.nixfox.ca:443" }';
+        '';
+      };
     };
   };
 }