feat: Added new minecraft instance

nixos/mirai/services/default.nix

@@ -17,6 +17,7 @@
     ./resolved.nix
     ./searxng.nix
     ./tailscale.nix
+    ./grafana.nix
 
     # ./ldap.nix
     # ./llama.nix

nixos/mirai/services/grafana.nix

@@ -0,0 +1,42 @@
+{config, ...}: {
+  services = {
+    grafana = {
+      enable = true;
+      settings = {
+        server = {
+          http_port = 3011;
+        };
+        "auth.proxy" = {
+          enabled = true;
+          header_name = "Remote-User";
+        };
+      };
+    };
+    prometheus = {
+      enable = true;
+    };
+    caddy = {
+      virtualHosts."grafana.darksailor.dev".extraConfig = ''
+        forward_auth localhost:5555 {
+            uri /api/authz/forward-auth
+            copy_headers Remote-User Remote-Groups Remote-Email Remote-Name
+        }
+        reverse_proxy localhost:${builtins.toString config.services.grafana.settings.server.http_port}
+      '';
+    };
+    authelia = {
+      instances.darksailor = {
+        settings = {
+          access_control = {
+            rules = [
+              {
+                domain = "grafana.darksailor.dev";
+                policy = "one_factor";
+              }
+            ];
+          };
+        };
+      };
+    };
+  };
+}

nixos/ryu/services/minecraft.nix

@@ -18,6 +18,7 @@
       "Serveus" = "79882fb6-d594-4073-a3d0-70a01d0abb67";
       "__Shun__" = "1c7a300f-98e4-402c-8741-432f3494bb25";
       "shashikant" = "20891e82-203c-4d04-9868-79a5879ecfc3";
+      "satuke" = "e4ad1799-3cfe-4cdc-b199-83ac617f1c5c";
     };
   in {
     minecraft-servers = {
@@ -25,41 +26,65 @@
       eula = true;
       openFirewall = true;
       environmentFile = config.sops.templates."craftmine.env".path;
-      servers.fabric = {
-        inherit whitelist;
-        enable = true;
-        # enable-rcon = true;
-        jvmOpts = "-Xmx4G -Xms4G";
-        package = pkgs.fabricServers.fabric-1_21_1;
-        serverProperties = {
-          motd = "Servius's Fabric Minecraft Server";
-          server-port = 25567;
-          level-seed = "4504535438041489910";
-          view-distance = 24;
-          white-list = true;
-        };
-      };
-      servers.craftmine = {
-        inherit whitelist;
-        enable = true;
-        jvmOpts = "-Xmx4G -Xms4G";
-        package = let
-          getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
-        in
-          pkgs.minecraft-server.override {
-            url = "https://piston-data.mojang.com/v1/objects/4527a9019e37e001770787e4523b505f79cac4c5/server.jar";
-            sha1 = "sha1-RSepAZ434AF3B4fkUjtQX3nKxMU=";
-            version = "25w14craftmine";
-            jre_headless = getJavaVersion 21;
+      servers = {
+        fabric = {
+          inherit whitelist;
+          enable = true;
+          # enable-rcon = true;
+          jvmOpts = "-Xmx4G -Xms4G";
+          package = pkgs.fabricServers.fabric-1_21_1;
+          serverProperties = {
+            motd = "Servius's Fabric Minecraft Server";
+            server-port = 25567;
+            level-seed = "4504535438041489910";
+            view-distance = 24;
+            white-list = true;
           };
+        };
+        craftmine = {
+          inherit whitelist;
+          enable = true;
+          jvmOpts = "-Xmx4G -Xms4G";
+          package = let
+            getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
+          in
+            pkgs.minecraft-server.override {
+              url = "https://piston-data.mojang.com/v1/objects/4527a9019e37e001770787e4523b505f79cac4c5/server.jar";
+              sha1 = "sha1-RSepAZ434AF3B4fkUjtQX3nKxMU=";
+              version = "25w14craftmine";
+              jre_headless = getJavaVersion 21;
+            };
 
-        serverProperties = {
-          enable-rcon = true;
-          "rcon.password" = "@CRAFTMINE_RCON_PASSWORD@";
-          motd = "Servius's Craftmine Server";
-          server-port = 25569;
-          white-list = true;
-          view-distance = 32;
+          serverProperties = {
+            enable-rcon = true;
+            "rcon.password" = "@CRAFTMINE_RCON_PASSWORD@";
+            motd = "Servius's Craftmine Server";
+            server-port = 25570;
+            white-list = true;
+            view-distance = 32;
+          };
+        };
+        craftmine-v2 = {
+          inherit whitelist;
+          enable = true;
+          jvmOpts = "-Xmx4G -Xms4G";
+          package = let
+            getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
+          in
+            pkgs.minecraft-server.override {
+              url = "https://piston-data.mojang.com/v1/objects/4527a9019e37e001770787e4523b505f79cac4c5/server.jar";
+              sha1 = "sha1-RSepAZ434AF3B4fkUjtQX3nKxMU=";
+              version = "25w14craftmine";
+              jre_headless = getJavaVersion 21;
+            };
+          serverProperties = {
+            enable-rcon = true;
+            "rcon.password" = "@CRAFTMINE_RCON_PASSWORD@";
+            motd = "Servius's Craftmine Server v2";
+            server-port = 25569;
+            white-list = true;
+            view-distance = 32;
+          };
         };
       };
     };

nixos/tsuba/services/default.nix

@@ -9,7 +9,7 @@
     ./homeassistant.nix
     ./flaresolverr.nix
     ./caddy.nix
-    ./grafana.nix
+    # ./grafana.nix
     # ./dnscrypt.nix
     # ./resolved.nix
     # ./blocky.nix

nixos/tsuba/services/grafana.nix

@@ -1,16 +0,0 @@
-{config, ...}: {
-  services = {
-    grafana = {
-      enable = true;
-    };
-    prometheus = {
-      enable = true;
-    };
-    caddy = {
-      virtualHosts."grafana.tsuba.darksailor.dev".extraConfig = ''
-        import hetzner
-        reverse_proxy localhost:${builtins.toString config.services.grafana.port}
-      '';
-    };
-  };
-}

nixos/tsuba/services/servarr.nix

@@ -42,7 +42,6 @@
            copy_headers Remote-User Remote-Groups Remote-Email Remote-Name
         }
       '';
-      # auth = "";
     in {
       "sonarr.tsuba.darksailor.dev".extraConfig = ''
         import hetzner