From ad4c3bea02b89f390652f69cffe43872ba6eef52 Mon Sep 17 00:00:00 2001
From: jz8132543 <i@dora.im>
Date: Fri, 29 Nov 2024 00:26:58 +0800
Subject: [PATCH] add: murmur

---
 lib/data/data.json                | 2 +-
 nixos/hosts/fra1/default.nix      | 1 -
 nixos/hosts/hkg4/default.nix      | 1 +
 nixos/modules/services/murmur.nix | 1 +
 terraform/cloudflare.tf           | 2 +-
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/data/data.json b/lib/data/data.json
index a03a5ca..b43a600 100644
--- a/lib/data/data.json
+++ b/lib/data/data.json
@@ -147,7 +147,7 @@
       "proxy": false
     },
     "murmur": {
-      "on": "fra1",
+      "on": "hkg4",
       "proxy": false
     },
     "ntfy": {
diff --git a/nixos/hosts/fra1/default.nix b/nixos/hosts/fra1/default.nix
index a632f07..2daf03a 100644
--- a/nixos/hosts/fra1/default.nix
+++ b/nixos/hosts/fra1/default.nix
@@ -17,7 +17,6 @@
       nixosModules.services.pastebin
       nixosModules.services.ollama
       nixosModules.services.jellyfin
-      nixosModules.services.murmur
       (import nixosModules.services.matrix { })
       (import nixosModules.services.keycloak { })
       (import nixosModules.services.vaultwarden { })
diff --git a/nixos/hosts/hkg4/default.nix b/nixos/hosts/hkg4/default.nix
index dae5049..03d06fd 100644
--- a/nixos/hosts/hkg4/default.nix
+++ b/nixos/hosts/hkg4/default.nix
@@ -17,6 +17,7 @@
       nixosModules.services.searx
       nixosModules.services.perplexica
       nixosModules.services.rustdesk
+      nixosModules.services.murmur
     ];
   nix.gc.options = lib.mkForce "-d";
 }
diff --git a/nixos/modules/services/murmur.nix b/nixos/modules/services/murmur.nix
index 6132b5c..d864bed 100644
--- a/nixos/modules/services/murmur.nix
+++ b/nixos/modules/services/murmur.nix
@@ -12,5 +12,6 @@
       welcometext = "<br />Welcome to <b>mumble.${config.networking.domain}</b>";
       sslCert = "${certDir}/cert.pem";
       sslKey = "${certDir}/key.pem";
+      group = "acme";
     };
 }
diff --git a/terraform/cloudflare.tf b/terraform/cloudflare.tf
index 2ac1b09..265b86c 100644
--- a/terraform/cloudflare.tf
+++ b/terraform/cloudflare.tf
@@ -88,7 +88,7 @@ locals {
     minio-console      = { on = "fra1", proxy = false }
     "admin.m"          = { on = "fra1", proxy = false }
     jellyfin           = { on = "fra1", proxy = false }
-    murmur             = { on = "fra1", proxy = false }
+    murmur             = { on = "hkg4", proxy = false }
     searx              = { on = "hkg4", proxy = false }
     morty              = { on = "hkg4", proxy = false }
     p                  = { on = "hkg4", proxy = false }