Split domains into their own var file and update all files accordingly

modules/system/services/server/minecraft/servers/johnside/default.nix

@@ -43,7 +43,7 @@ in {
     };
 
     # BlueMap webhost
-    nginx.virtualHosts."john.${config.secrets.jimDomain}" = {
+    nginx.virtualHosts."john.${config.domains.jim1}" = {
       enableACME = true;
       forceSSL = true;
       locations."/" = {
@@ -52,16 +52,4 @@ in {
       };
     };
   };
-
-  # Allow Nginx to read and write to paths
-  systemd.services.nginx.serviceConfig = {
-    ReadWritePaths = [ "/var/www/Jimbo-Landing-Page/streams/hls/" ];
-  };
-
-  # Open HTTP and HTTPs ports
-  networking.firewall = {
-    allowedTCPPorts = [
-      80 443 # Nginx
-    ];
-  };
 }

modules/system/services/server/minecraft/servers/roguecraft/default.nix

@@ -12,19 +12,19 @@ in {
         server-port = 30014;
         motd = "\\u00A7l\\u00A7bJimbo's \\u00A7cRoguecraft \\u00A7bserver.";
         require-resource-pack = true;
-        resource-pack = "https://${config.secrets.jimDomain}/roguecraftresourcepackredir";
+        resource-pack = "https://${config.domains.jim1}/roguecraftresourcepackredir";
         resource-pack-sha1 = "b540c0562aba90c3ead2356bb9cb74fcf0db36b3";
       };
       whitelist = common.whitelist;
       symlinks = common.paperSymlinks;
       files = common.configFiles // {
         "world/datapacks/roguecraft.zip" = builtins.fetchurl {
-          url = "https://${config.secrets.jimDomain}/roguecraftdatapackredir";
+          url = "https://${config.domains.jim1}/roguecraftdatapackredir";
           sha256 = "04zrkvzvi1i898al45fh9j3k635sf9qhwca7phbv4ynkfl8bz3q3";
         };
       };
     };
-    nginx.virtualHosts."${config.secrets.jimDomain}".locations = {
+    nginx.virtualHosts."${config.domains.jim1}".locations = {
       "/roguecraftdatapackredir" = {
         return = "301 https://cdn.modrinth.com/data/HtKjVijx/versions/Rme4c23R/Roguecraft%201.2.6%20-%20Data%20Pack.zip";
       };

modules/system/services/server/minecraft/servers/velocity/default.nix

@@ -40,11 +40,18 @@ in {
 
   # Open ports for proxy
   networking.firewall = {
+    # Server and info
     allowedTCPPorts = [
-      25565 19132 30013 5657 # Minecraft server info
+      25565
+      19132
+      30013
+      5657
     ];
+    # Server, VC, and Bedrock
     allowedUDPPorts = [
-      25565 19132 30013 # Minecraft server, VC, and Bedrock
+      25565
+      19132
+      30013
     ];
   };
 }