From 5ff54ebfcaa414a2c699d46fd2801b8207ed774d Mon Sep 17 00:00:00 2001
From: Ittihadyya <Ittihadyya@collective-conciousness.monster>
Date: Fri, 22 Nov 2024 08:23:34 +0200
Subject: [PATCH] finish setting up murmur? i hope?

---
 secrets.yaml                   |  5 ++---
 services/murmur/murmur.mod.nix | 10 ++++++++--
 services/website/Caddyfile     |  5 +++++
 sops.mod.nix                   |  2 --
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/secrets.yaml b/secrets.yaml
index 24a475e..46816c3 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -18,7 +18,6 @@ couchdb_admin_account: ENC[AES256_GCM,data:iyl1SLoPlpZYUw==,iv:TaA+KmlGeexpEW0H/
 gts_db_pass: ENC[AES256_GCM,data:oEdBEFomImyOFiCLGYL3upJZ4yxAm/iACAZlr9AU0Wp9a60=,iv:VzcE8SM8rjkfdTddJVIohW5JLcJPxF2OSfM3T5KZiWQ=,tag:FKMaW+gB3Q4N72rE4kCmkw==,type:str]
 forgejo_db_pass: ENC[AES256_GCM,data:/whBxapqWGNMynXCXVxrQv/XS6ivdTUE6YkuKZ2Rk9kIojKQQcg6t52OgC8lgA3TUlGgeUnn,iv:KAIB0z+QvWpErdWYNJllV1Pv3A5MDwZpYP/9ofZkSBI=,tag:BLAtl9XdHf2Aa1KFVRnLGg==,type:str]
 postgresdb_admin_password: ENC[AES256_GCM,data:DopfWHTOAwihPa9+197pX3TE03dqWST/7+o=,iv:O9dzjYs9A1vBSp17Kyiz41KllUvpUORCmag0AYe8MNA=,tag:FS0v5us/ANMXweXrSIH2xQ==,type:str]
-murmur_registry_pass: ENC[AES256_GCM,data:aX7aLS6hk3iFQ3o=,iv:SEbyujyXEh0Wk6yTRelqlel8t9YMpz/GwWNJCGlS4vM=,tag:3GoXgczJyqxvk5KgiZNHIw==,type:str]
 murmur_welcome_message: ENC[AES256_GCM,data:k05ez0/raIbgBMu90NrAg5O1nkucDibQXdj8U+TXO3baH+fTexMZBfVqLvRkxQUp6P4tuTUiDaHORO1ezzF52Wfk9NjqMZyYowA62WRmqOoMh0cCUJKetMqly4/eS3/7kYoS9HJ0CP8ANpebUj0CiVBT0H4vNyg0pews3514dciVPN1++93II8IzSx+wXnivns/32ki0YmZrjhTREA==,iv:7scQhjy2uc0FL/26k3FbarA9Nm8GtQCqD7kod4lOlwM=,tag:wSm+6aodL+FD3L4C2+nzgg==,type:str]
 murmur_login_password: ENC[AES256_GCM,data:Fh6XjSxiLEP1jE56D9JRv0TokYOjEafeDkrh9/x5f+Rv4qgH18k54Le4dyl3EzNQ,iv:QbAPJx4xe2DT7AhXbOvQto4M6ICKVlJ/BXoP3ORjd4o=,tag:clHHTrQdi1bzA21gjY7mSg==,type:str]
 sops:
@@ -36,8 +35,8 @@ sops:
             NHg3M2l5MWY2alpHdVhIbE5PQ3VxeW8Kr+o5K2EIrPSfIFBWK68mWl4lWJooZxF/
             vKsU99C2iIsbX/eTF2uNQqeDkOqy5egKCG42xikwycGFO/gbnCDIdw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-11-21T20:30:46Z"
-    mac: ENC[AES256_GCM,data:GA4QmHuYVFYVFX4dTJSXKTgWnkyQuBWOKpCBjWXC+aZ+d/ADzpL6g7mXY3dNz/3xBLirJctDLx0mfCPQ4It73r9CT+wI4gtRtpDXQNyBFHyj0sLrWa200tteoAlwKEY4jbrbvAM+9Vtb7czud4UgcDJhB0mTJ0QmL9HuhsNC6BM=,iv:tWpP0Wd+KlZxVN1WSA1fasJKdEsJ9+yCHX+SEwNOV4c=,tag:JW4Egs8f0fc5CSizYizbMA==,type:str]
+    lastmodified: "2024-11-22T06:13:57Z"
+    mac: ENC[AES256_GCM,data:vBEGgzmUZpc67qwPmXNW30IVFBrYNMxgZHF36D1igbivVKa+JFHYn/V4EQuKjREhbXAo9NJlCePz5j0JdDXH5IekZjIPzFlIG+ex9SVwSt60xilk0+k05tnMbNnid8L0lhmb3+pbzieyjPhiRYLjzMFsks5dtr5jTCrIp2JlULA=,iv:3LvtP1GTOfHh6wO90cYFb8GgHEJI0lp2cY3nSZ7Oqho=,tag:wUNfx7cubw2vtAKtUfgblw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.1
diff --git a/services/murmur/murmur.mod.nix b/services/murmur/murmur.mod.nix
index b707572..8b0f2e6 100644
--- a/services/murmur/murmur.mod.nix
+++ b/services/murmur/murmur.mod.nix
@@ -5,10 +5,16 @@
         enable = true;
 
         environmentFile = "${config.sops.templates."murmur.env.secrets.yaml".path}";
-
+        # the environment variables are provided by, evidently, the environment file.
         welcometext = "$MURMUR_WELCOME_MESSAGE";
-        registerPassword = "$MURMUR_REGISTRY_PASSWORD";
+       # registerPassword = "$MURMUR_REGISTRY_PASSWORD"; # removed as we realized we don't actually want it to be a public server.
         password = "$MURMUR_LOGIN_PASSWORD";
+
+        port = 64738; # tcp/udp - this is the default but i'm writing it out as to not have to dig into the declaration every time i need to know which port it is.
+        openFirewall = true; # this is fine since glucose is not public-facing. otherwise i would prefer to do it through `networking`
+        registerName = "Adyya's cave of hushed tones";
+        registerUrl = "https://mumble.collective-conciousness.monster";
+        registerHostName = "mumble.collective-conciousness.mosnter"; # i vaguely know what the difference between these two are but it is a bit strange, i guess.
       };
     })
   ];
diff --git a/services/website/Caddyfile b/services/website/Caddyfile
index 57836f3..c27ddc6 100644
--- a/services/website/Caddyfile
+++ b/services/website/Caddyfile
@@ -43,4 +43,9 @@ https://cache.collective-conciousness.monster {
     encode zstd gzip
      
     reverse_proxy 10.24.1.4:5020
+}
+
+https://murmur.collective-conciousness.monster, murmur.collective-conciousness.monster {
+    # encode zstd gzip # unsure if this will work with murmur.
+    reverse_proxy 10.24.1.4:64738
 }
\ No newline at end of file
diff --git a/sops.mod.nix b/sops.mod.nix
index 20bc8d3..1ee58c9 100644
--- a/sops.mod.nix
+++ b/sops.mod.nix
@@ -49,11 +49,9 @@
       }
     )
     ({config, ...}:{
-      sops.secrets.murmur_registry_pass = { };
       sops.secrets.murmur_login_password = { };
       sops.secrets.murmur_welcome_message = { };
       sops.templates."murmur.env.secrets.yaml".content = ''
-        MURMUR_REGISTRY_PASSWORD="${config.sops.placeholder."murmur_registry_pass"}"
         MURMUR_LOGIN_PASSWORD="${config.sops.placeholder."murmur_login_pass"}"
         MURMUR_WELCOME_MESSAGE="${config.sops.placeholder."murmur_welcome_message"}"
       '';