diff --git a/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix b/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix index ae9f71b..3b8a00f 100644 --- a/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix +++ b/nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix @@ -363,6 +363,10 @@ in locations."/".proxyPass = "http://simpcraft-oci.${domain}:8100"; useACMEHost = pubDomain; }; + "mc-rail.${pubDomain}" = { + locations."/".proxyPass = "http://simpcraft-staging-oci.${domain}:3876"; + useACMEHost = pubDomain; + }; "librespeed.${domain}" = { locations."/".proxyPass = "http://localhost:8989"; diff --git a/nixos/boxes/colony/vms/whale2/minecraft/default.nix b/nixos/boxes/colony/vms/whale2/minecraft/default.nix index 2fe60b2..5bd5d24 100644 --- a/nixos/boxes/colony/vms/whale2/minecraft/default.nix +++ b/nixos/boxes/colony/vms/whale2/minecraft/default.nix @@ -57,42 +57,42 @@ in ]; }; - # simpcraft-staging = { - # image = "git.nul.ie/dev/craftblock:2024.1.0-java17-alpine"; + simpcraft-staging = { + image = "git.nul.ie/dev/craftblock:2024.1.0-java17-alpine"; - # environment = { - # TYPE = "MODRINTH"; + environment = { + TYPE = "MODRINTH"; - # EULA = "true"; - # ENABLE_QUERY = "true"; - # ENABLE_RCON = "true"; - # MOTD = "§4§k----- §9S§ai§bm§cp§dc§er§fa§6f§5t [staging] §4§k-----"; - # ICON = "/ext/icon.png"; + EULA = "true"; + ENABLE_QUERY = "true"; + ENABLE_RCON = "true"; + MOTD = "§4§k----- §9S§ai§bm§cp§dc§er§fa§6f§5t [staging] §4§k-----"; + ICON = "/ext/icon.png"; - # EXISTING_WHITELIST_FILE = "SYNCHRONIZE"; - # WHITELIST = whitelist; - # EXISTING_OPS_FILE = "SYNCHRONIZE"; - # OPS = op; - # DIFFICULTY = "normal"; - # SPAWN_PROTECTION = "0"; - # VIEW_DISTANCE = "20"; + EXISTING_WHITELIST_FILE = "SYNCHRONIZE"; + WHITELIST = whitelist; + EXISTING_OPS_FILE = "SYNCHRONIZE"; + OPS = op; + DIFFICULTY = "normal"; + SPAWN_PROTECTION = "0"; + VIEW_DISTANCE = "20"; - # MAX_MEMORY = "4G"; - # MODRINTH_MODPACK = "https://cdn.modrinth.com/data/CIYf3Hk8/versions/Ym3sIi6H/Simpcraft-0.2.0.mrpack"; + MAX_MEMORY = "4G"; + MODRINTH_MODPACK = "https://cdn.modrinth.com/data/CIYf3Hk8/versions/Ym3sIi6H/Simpcraft-0.2.0.mrpack"; - # TZ = "Europe/Dublin"; - # }; - # environmentFiles = [ config.age.secrets."whale2/simpcraft.env".path ]; + TZ = "Europe/Dublin"; + }; + environmentFiles = [ config.age.secrets."whale2/simpcraft.env".path ]; - # volumes = [ - # "minecraft_staging_data:/data" - # "${./icon.png}:/ext/icon.png:ro" - # ]; + volumes = [ + "minecraft_staging_data:/data" + "${./icon.png}:/ext/icon.png:ro" + ]; - # extraOptions = [ - # ''--network=colony:${dockerNetAssignment allAssignments "simpcraft-staging-oci"}'' - # ]; - # }; + extraOptions = [ + ''--network=colony:${dockerNetAssignment allAssignments "simpcraft-staging-oci"}'' + ]; + }; }; my = {