From 2d66759961693f9a12442d686ecd0978dfc0918a Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Mon, 15 Jan 2024 02:08:58 +0100
Subject: [PATCH] Re-domain matrix and servers

---
 inventory/serguzim.net.yml      |  6 +++---
 roles/healthcheck/vars/main.yml |  2 +-
 roles/synapse/vars/main.yml     | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/inventory/serguzim.net.yml b/inventory/serguzim.net.yml
index b641194..c16c5fe 100644
--- a/inventory/serguzim.net.yml
+++ b/inventory/serguzim.net.yml
@@ -3,7 +3,7 @@ all:
     local-dev:
       ansible_connection: local
     node001:
-      ansible_host: node001.serguzim.net
+      ansible_host: node001.vpn.serguzim.net
       ansible_port: "{{ vault_node001.ansible_port }}"
       ansible_user: "{{ vault_node001.ansible_user }}"
       host_vpn:
@@ -16,7 +16,7 @@ all:
           - minecraft-2_data
 
     node002:
-      ansible_host: node002.serguzim.net
+      ansible_host: node002.vpn.serguzim.net
       ansible_port: "{{ vault_node002.ansible_port }}"
       ansible_user: "{{ vault_node002.ansible_user }}"
       host_vpn:
@@ -41,7 +41,7 @@ all:
           - vikunja_data
 
     node003:
-      ansible_host: node003.serguzim.net
+      ansible_host: node003.vpn.serguzim.net
       ansible_port: "{{ vault_node003.ansible_port }}"
       ansible_user: "{{ vault_node003.ansible_user }}"
       host_vpn:
diff --git a/roles/healthcheck/vars/main.yml b/roles/healthcheck/vars/main.yml
index cd15cab..4dd4f9e 100644
--- a/roles/healthcheck/vars/main.yml
+++ b/roles/healthcheck/vars/main.yml
@@ -11,7 +11,7 @@ healthcheck_env:
 
   HTTP_HC_UID: "{{ vault_healthcheck.hc_uid.http }}"
 
-  MATRIX_SERVER: https://matrix.msrg.cc
+  MATRIX_SERVER: https://matrix.serguzim.me
   MATRIX_SERVER_FEDTESTER: msrg.cc
   MATRIX_HC_UID: "{{ vault_healthcheck.hc_uid.matrix }}"
   MATRIX_TOKEN: "{{ vault_healthcheck.matrix.token }}"
diff --git a/roles/synapse/vars/main.yml b/roles/synapse/vars/main.yml
index 8379f00..3e615d6 100644
--- a/roles/synapse/vars/main.yml
+++ b/roles/synapse/vars/main.yml
@@ -1,7 +1,7 @@
 ---
 synapse_svc:
   name: synapse
-  domain: matrix.msrg.cc
+  domain: matrix.serguzim.me
   docker_host: synapse-admin
   port: 80
   caddy_extra: |
@@ -12,9 +12,9 @@ synapse_svc:
         reverse_proxy synapse:8008
     }
   extra_svcs:
-    - domain: matrix.msrg.cc:8448
+    - domain: matrix.serguzim.me:8448
       additional_domains:
-        - msrg.cc:8448
+        - serguzim.me:8448
       docker_host: synapse
       port: 8008
   db:
@@ -26,12 +26,12 @@ synapse_svc:
 
 synapse_env:
   SYNAPSE_CONFIG_PATH: "{{ ('/', svc.config_path) | path_join }}"
-  REACT_APP_SERVER: https://matrix.msrg.cc
+  REACT_APP_SERVER: https://matrix.serguzim.me
 
 synapse_yml:
   server_name: msrg.cc
   pid_file: "{{ (svc.config_path, 'homeserver.pid') | path_join }}"
-  public_baseurl: https://matrix.msrg.cc/
+  public_baseurl: https://matrix.serguzim.me/
   allow_public_rooms_without_auth: true
   allow_public_rooms_over_federation: true