From 8a2d9462060728b3ca01ac022f77c071c52f34ec Mon Sep 17 00:00:00 2001
From: Akshay Mankar <itsakshaymankar@gmail.com>
Date: Sun, 19 Nov 2023 15:47:25 +0100
Subject: [PATCH] matrix: Use production domains

---
 hosts/nachtigall/apps/coturn.nix              |  2 +-
 .../apps/matrix/element-client-config.nix     |  4 ++--
 hosts/nachtigall/apps/matrix/irc.nix          |  4 ++--
 .../apps/matrix/mautrix-telegram.nix          |  6 +++---
 hosts/nachtigall/apps/matrix/synapse.nix      |  6 +++---
 hosts/nachtigall/apps/nginx-matrix.nix        | 19 ++++---------------
 6 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/hosts/nachtigall/apps/coturn.nix b/hosts/nachtigall/apps/coturn.nix
index 26157fec..9667c1c8 100644
--- a/hosts/nachtigall/apps/coturn.nix
+++ b/hosts/nachtigall/apps/coturn.nix
@@ -14,7 +14,7 @@
     max-port = 50000;
     use-auth-secret = true;
     static-auth-secret-file = "/run/agenix/coturn-static-auth-secret";
-    realm = "turn.test.pub.solar";
+    realm = "turn.pub.solar";
     cert = "${config.security.acme.certs.${realm}.directory}/full.pem";
     pkey = "${config.security.acme.certs.${realm}.directory}/key.pem";
     extraConfig =
diff --git a/hosts/nachtigall/apps/matrix/element-client-config.nix b/hosts/nachtigall/apps/matrix/element-client-config.nix
index d1425401..113cb7e9 100644
--- a/hosts/nachtigall/apps/matrix/element-client-config.nix
+++ b/hosts/nachtigall/apps/matrix/element-client-config.nix
@@ -1,8 +1,8 @@
 { pkgs, lib, ... }: {
 	default_server_config = {
 		"m.homeserver" = {
-			base_url = "https://matrix.test.pub.solar";
-			server_name = "test.pub.solar";
+			base_url = "https://matrix.pub.solar";
+			server_name = "pub.solar";
 		};
 		"m.identity_server" = {
 			base_url = "";
diff --git a/hosts/nachtigall/apps/matrix/irc.nix b/hosts/nachtigall/apps/matrix/irc.nix
index b00a5b02..8f659850 100644
--- a/hosts/nachtigall/apps/matrix/irc.nix
+++ b/hosts/nachtigall/apps/matrix/irc.nix
@@ -8,9 +8,9 @@
     settings = {
       homeserver = {
         # TODO: Use the port from synapse config
-        domain = "test.pub.solar";
+        domain = "pub.solar";
         url = "http://127.0.0.1:8008";
-        media_url = "https://matrix.test.pub.solar";
+        media_url = "https://matrix.pub.solar";
         enablePresence = false;
       };
       ircService = {
diff --git a/hosts/nachtigall/apps/matrix/mautrix-telegram.nix b/hosts/nachtigall/apps/matrix/mautrix-telegram.nix
index 438979d8..b9fb60ae 100644
--- a/hosts/nachtigall/apps/matrix/mautrix-telegram.nix
+++ b/hosts/nachtigall/apps/matrix/mautrix-telegram.nix
@@ -13,7 +13,7 @@
       homeserver = {
         # TODO: Use the port from synapse config
         address = "http://127.0.0.1:8008";
-        domain = "test.pub.solar";
+        domain = "pub.solar";
         verify_ssl = true;
       };
       appservice = {
@@ -34,7 +34,7 @@
         };
         public = {
           enabled = true;
-          external = "https://matrix.test.pub.solar/c3c3f34b-29fb-5feb-86e5-98c75ec8214b";
+          external = "https://matrix.pub.solar/c3c3f34b-29fb-5feb-86e5-98c75ec8214b";
           prefix = "/c3c3f34b-29fb-5feb-86e5-98c75ec8214b";
         };
       };
@@ -140,7 +140,7 @@
         username_template = "telegram_{userid}";
 
         permissions = {
-          "test.pub.solar" = "full";
+          "pub.solar" = "full";
         };
       };
 
diff --git a/hosts/nachtigall/apps/matrix/synapse.nix b/hosts/nachtigall/apps/matrix/synapse.nix
index 749f0018..1429798a 100644
--- a/hosts/nachtigall/apps/matrix/synapse.nix
+++ b/hosts/nachtigall/apps/matrix/synapse.nix
@@ -1,7 +1,7 @@
 { flake, config, pkgs, ... }:
 let
-  publicDomain  = "matrix.test.pub.solar";
-  serverDomain = "test.pub.solar";
+  publicDomain  = "matrix.pub.solar";
+  serverDomain = "pub.solar";
 in {
   age.secrets."matrix-synapse-signing-key" = {
     file = "${flake.self}/secrets/matrix-synapse-signing-key.age";
@@ -19,7 +19,7 @@ in {
     enable = true;
     settings = {
       server_name = serverDomain;
-      public_baseurl = "https://matrix.test.pub.solar/";
+      public_baseurl = "https://${publicDomain}/";
       database = {
         name = "psycopg2";
         args = {
diff --git a/hosts/nachtigall/apps/nginx-matrix.nix b/hosts/nachtigall/apps/nginx-matrix.nix
index dbf927bf..eee9c0a2 100644
--- a/hosts/nachtigall/apps/nginx-matrix.nix
+++ b/hosts/nachtigall/apps/nginx-matrix.nix
@@ -47,19 +47,7 @@ in
       locations = wellKnownLocations "pub.solar";
     };
 
-    #######################################
-    # Stuff below is still in betatesting #
-    #######################################
-    "test.pub.solar" = {
-      root = "/dev/null";
-
-      forceSSL = lib.mkDefault true;
-      enableACME = lib.mkDefault true;
-
-      locations = (wellKnownLocations "test.pub.solar");
-    };
-
-    "chat.test.pub.solar" = {
+    "chat.pub.solar" = {
       forceSSL = true;
       enableACME = true;
       root = pkgs.element-web.override {
@@ -67,7 +55,7 @@ in
       };
     };
 
-    "matrix.test.pub.solar" = {
+    "matrix.pub.solar" = {
       root = "/dev/null";
 
       forceSSL = lib.mkDefault true;
@@ -83,6 +71,7 @@ in
         # "/metrics" = {
         # };
 
+        # For telegram
         "/c3c3f34b-29fb-5feb-86e5-98c75ec8214b" = {
           proxyPass = "http://127.0.0.1:8009";
           extraConfig = commonHeaders;
@@ -105,7 +94,7 @@ in
       };
     };
     "matrix.pub.solar-federation" = {
-      serverName = "matrix.test.pub.solar";
+      serverName = "matrix.pub.solar";
       forceSSL = lib.mkDefault true;
       enableACME = lib.mkDefault true;
       listen = [{