From de0b20834085a31f6dee30aa6854470427017ee9 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Mon, 21 Mar 2022 16:06:50 +0100
Subject: [PATCH] Revert "vueko/murmur: Migrate to okarin"

This reverts commit 50ed985671f53369f911f09a6bdffcfdc39b2666.

The performance on okarin is unbearably slow which makes mumble almost
unusable.
---
 machines/default.nix                |  6 +++---
 machines/okarin/configuration.nix   |  1 -
 machines/okarin/services/mumble.nix | 28 ----------------------------
 machines/vueko/configuration.nix    | 24 ++++++++++++++++++++++++
 machines/vueko/secrets.yaml         |  5 +++--
 5 files changed, 30 insertions(+), 34 deletions(-)
 delete mode 100644 machines/okarin/services/mumble.nix

diff --git a/machines/default.nix b/machines/default.nix
index 75585d5..7d4e5cd 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -12,6 +12,9 @@ in
   };
   vueko = {
     system = "x86_64-linux";
+    extraModules = [
+      "${inputs.infinisilSystem}/config/new-modules/murmur.nix"
+    ];
 
     targetHost = "vueko.sbruder.de";
   };
@@ -40,9 +43,6 @@ in
   };
   okarin = {
     system = "x86_64-linux";
-    extraModules = [
-      "${inputs.infinisilSystem}/config/new-modules/murmur.nix"
-    ];
 
     targetHost = "okarin.sbruder.de";
   };
diff --git a/machines/okarin/configuration.nix b/machines/okarin/configuration.nix
index ba9c178..fd80401 100644
--- a/machines/okarin/configuration.nix
+++ b/machines/okarin/configuration.nix
@@ -10,7 +10,6 @@
     ./services/hedgedoc.nix
     ./services/invidious
     ./services/libreddit.nix
-    ./services/mumble.nix
     ./services/nitter.nix
     ./services/sbruder.xyz
     ./services/torrent.nix
diff --git a/machines/okarin/services/mumble.nix b/machines/okarin/services/mumble.nix
deleted file mode 100644
index 5a41e76..0000000
--- a/machines/okarin/services/mumble.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, ... }:
-
-{
-  sops.secrets.murmur-superuser = {
-    owner = config.users.users.murmur.name;
-    sopsFile = ../secrets.yaml;
-  };
-
-  users.users.murmur.isSystemUser = true; # Infinisil’s module does not set that
-  services.murmur = {
-    enable = true;
-    openFirewall = true;
-    superuserPasswordFile = config.sops.secrets.murmur-superuser.path;
-    acmeDomain = "mumble.sbruder.de";
-    config = {
-      bandwidth = "128000";
-      obfuscate = true;
-      logfile = ""; # log to stdout
-
-      channelname = ''[ \\-=\\w\\#\\[\\]\\{\\}\\(\\)\\@\\|]+'';
-    };
-  };
-
-  services.nginx.virtualHosts."mumble.sbruder.de" = {
-    enableACME = true;
-    forceSSL = true;
-  };
-}
diff --git a/machines/vueko/configuration.nix b/machines/vueko/configuration.nix
index 83b4b5d..a126f2f 100644
--- a/machines/vueko/configuration.nix
+++ b/machines/vueko/configuration.nix
@@ -58,6 +58,10 @@
 
         locations."/".proxyPass = "http://localhost:5232";
       };
+      "mumble.sbruder.de" = {
+        enableACME = true;
+        forceSSL = true;
+      };
       "bangs.sbruder.de" = {
         enableACME = true;
         forceSSL = true;
@@ -87,6 +91,26 @@
     };
   };
 
+  sops.secrets.murmur-superuser = {
+    owner = config.users.users.murmur.name;
+    sopsFile = ./secrets.yaml;
+  };
+
+  users.users.murmur.isSystemUser = true; # Infinisil’s module does not set that
+  services.murmur = {
+    enable = true;
+    openFirewall = true;
+    superuserPasswordFile = config.sops.secrets.murmur-superuser.path;
+    acmeDomain = "mumble.sbruder.de";
+    config = {
+      bandwidth = "128000";
+      obfuscate = true;
+      logfile = ""; # log to stdout
+
+      channelname = ''[ \\-=\\w\\#\\[\\]\\{\\}\\(\\)\\@\\|]+'';
+    };
+  };
+
   services.bang-evaluator = {
     enable = true;
     listenAddress = ":8000";
diff --git a/machines/vueko/secrets.yaml b/machines/vueko/secrets.yaml
index 6321091..7bdda36 100644
--- a/machines/vueko/secrets.yaml
+++ b/machines/vueko/secrets.yaml
@@ -1,3 +1,4 @@
+murmur-superuser: ENC[AES256_GCM,data:jTVEa1KmbGAIxxFS2/uIlDCnnJTtGmKFZQ==,iv:YJIfcXlgKEwIRzFEY94dgReNjWZqLAqL0Rb6TG4IHIE=,tag:MVzaRkb24QyyNyFCEMwmzQ==,type:str]
 wg-home-private-key: ENC[AES256_GCM,data:/RHNF6Zw6CTWa9ahUhGWRfkR8KIj+HdqUIojA1w6HQBFbZ/+Vo+CcYTYO5I=,iv:2sDH1P3VRjmLw6Ilkq0rw/hossHrNWP5uRvX9yr5fLE=,tag:KIT5GCfXuhg6RjA8+Nmtnw==,type:str]
 turn-static-auth-secret: ENC[AES256_GCM,data:Nz94xw5sBuAgEqVpwiV44Rd3km16H46X6jVf2gzE+mbbVt2TXExv/7yegQtXI++eBo6q4wbpOfxwl0b1Pvsa/A==,iv:HSdqj43Vmq5McWAbMoxeNUa38UD75Xe4PJEwY5mKjOQ=,tag:cFpFsVwhisWt7JMMzJemCA==,type:str]
 sops:
@@ -6,8 +7,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-03-18T15:51:43Z"
-    mac: ENC[AES256_GCM,data:YRZGoW0PxHTkdXp7/Af+evicxbOYD9YRL6Sze5YkZ3Bcc396aEHp8lc7Ix/Z9lX2AKLcHP5S84xP2oomq79ayeFwpomNbxQJJgiA7WJn3WD29Mw5s/tSe1cIBNBimbc11nip5Zqq4sAtb48mg8O1/CXNqaYtnJE2Hfq+3hG0tcg=,iv:qzs7Bq0va7Nr8e20LGJtdBRJ/4UlNCOiYrM0yy1z6JM=,tag:z59Q8SafZ1i8IB/E8rIu2Q==,type:str]
+    lastmodified: "2021-12-01T16:49:21Z"
+    mac: ENC[AES256_GCM,data:wLy9If4/YdAVILwz1vSzCQsjG0U8Z2GvpME/+xW9pS/xmKoXTwaxP2QQpy8ReTmtikpbKS327j5pz2dSMiweqaUFSVb1nIEvUFxV4PKnxf5ubJalPZAGa82Cw0aassMKz0IAd8rDF/xK9RoB3ayRluYKAP/qnbEcFrys0BokGE0=,iv:Yw3tG1J135QImJqXEGrpSq3k8Lo++uUXfEKmCCNCpDg=,tag:FChnsJ1qIzalpVypMIilrg==,type:str]
     pgp:
         - created_at: "2021-04-06T11:13:54Z"
           enc: |