From 2b10fdd2cf3d942efcc2bbd5ca40db5f68de4b97 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Tue, 25 Mar 2025 23:43:46 -0400 Subject: [PATCH] disable bcg-plus Signed-off-by: ahuston-0 --- systems/palatine-hill/docker/act_config.yaml | 1 - systems/palatine-hill/docker/minecraft.nix | 74 ++++++++++---------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/systems/palatine-hill/docker/act_config.yaml b/systems/palatine-hill/docker/act_config.yaml index 5e255af..f66fa4c 100644 --- a/systems/palatine-hill/docker/act_config.yaml +++ b/systems/palatine-hill/docker/act_config.yaml @@ -1,5 +1,4 @@ # Example configuration file, it's safe to copy this as the default config file without any modification. - # You don't have to copy this file to your instance, # just run `./act_runner generate-config > config.yaml` to generate a config file. log: diff --git a/systems/palatine-hill/docker/minecraft.nix b/systems/palatine-hill/docker/minecraft.nix index 141fbe0..37fae2b 100644 --- a/systems/palatine-hill/docker/minecraft.nix +++ b/systems/palatine-hill/docker/minecraft.nix @@ -9,31 +9,31 @@ let divinejourney = "dj.alicehuston.xyz"; rlcraft = "rlcraft.alicehuston.xyz"; arcanum-institute = "arcanum.alicehuston.xyz"; - bcg-plus = "bcg.alicehuston.xyz"; + # bcg-plus = "bcg.alicehuston.xyz"; }; defaultServer = "rlcraft"; - defaultEnv = { - EULA = "true"; - TYPE = "AUTO_CURSEFORGE"; - STOP_SERVER_ANNOUNCE_DELAY = "120"; - STOP_DURATION = "600"; - SYNC_CHUNK_WRITES = "false"; - USE_AIKAR_FLAGS = "true"; - MEMORY = "8GB"; - ALLOW_FLIGHT = "true"; - MAX_TICK_TIME = "-1"; - }; + # defaultEnv = { + # EULA = "true"; + # TYPE = "AUTO_CURSEFORGE"; + # STOP_SERVER_ANNOUNCE_DELAY = "120"; + # STOP_DURATION = "600"; + # SYNC_CHUNK_WRITES = "false"; + # USE_AIKAR_FLAGS = "true"; + # MEMORY = "8GB"; + # ALLOW_FLIGHT = "true"; + # MAX_TICK_TIME = "-1"; + # }; - defaultOptions = [ - "--stop-signal=SIGTERM" - "--stop-timeout=1800" - "--network=minecraft-net" - ]; + # defaultOptions = [ + # "--stop-signal=SIGTERM" + # "--stop-timeout=1800" + # "--network=minecraft-net" + # ]; - vars = import ../vars.nix; - minecraft_path = "${vars.primary_games}/minecraft"; + # vars = import ../vars.nix; + # minecraft_path = "${vars.primary_games}/minecraft"; in { virtualisation.oci-containers.containers = { @@ -67,24 +67,24 @@ in # log-driver = "local"; # environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; # }; - bcg-plus = { - image = "itzg/minecraft-server:java17"; - volumes = [ - "${minecraft_path}/bcg-plus/modpacks:/modpacks:ro" - "${minecraft_path}/bcg-plus/data:/data" - ]; - hostname = "bcg-plus"; - environment = defaultEnv // { - VERSION = "1.17"; - CF_SLUG = "bcg"; - DIFFICULTY = "normal"; - DEBUG = "true"; - # ENABLE_COMMAND_BLOCK = "true"; - }; - extraOptions = defaultOptions; - log-driver = "local"; - environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; - }; + # bcg-plus = { + # image = "itzg/minecraft-server:java17"; + # volumes = [ + # "${minecraft_path}/bcg-plus/modpacks:/modpacks:ro" + # "${minecraft_path}/bcg-plus/data:/data" + # ]; + # hostname = "bcg-plus"; + # environment = defaultEnv // { + # VERSION = "1.17"; + # CF_SLUG = "bcg"; + # DIFFICULTY = "normal"; + # DEBUG = "true"; + # # ENABLE_COMMAND_BLOCK = "true"; + # }; + # extraOptions = defaultOptions; + # log-driver = "local"; + # environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; + # }; }; sops = {