diff --git a/systems/palatine-hill/docker/minecraft.nix b/systems/palatine-hill/docker/minecraft.nix index a63a53f..ffddae8 100644 --- a/systems/palatine-hill/docker/minecraft.nix +++ b/systems/palatine-hill/docker/minecraft.nix @@ -4,6 +4,8 @@ let servers = { atm6 = "atm6.alicehuston.xyz"; stoneblock3 = "sb3.alicehuston.xyz"; + stoneblock-4 = "sb4.alicehuston.xyz"; + submerged-2 = "sm4.alicehuston.xyz"; RAD2 = "rad.alicehuston.xyz"; skyfactory = "sf.alicehuston.xyz"; divinejourney = "dj.alicehuston.xyz"; @@ -77,54 +79,78 @@ in # log-driver = "local"; # environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; #}; - prominence-ii = { + #prominence-ii = { + # image = "itzg/minecraft-server:java25-graalvm"; + # volumes = [ + # "${minecraft_path}/prominence-ii/modpacks:/modpacks:ro" + # "${minecraft_path}/prominence-ii/data:/data" + # ]; + # hostname = "pii"; + # environment = defaultEnv // { + # VERSION = "1.20.1"; + # CF_SLUG = "prominence-2-hasturian-era"; + # CF_FILENAME_MATCHER = "3.9.14hf"; + # USE_AIKAR_FLAGS = "false"; + # USE_MEOWICE_FLAGS = "true"; + # USE_MEOWICE_GRAALVM_FLAGS = "true"; + # DIFFICULTY = "hard"; + # ENABLE_COMMAND_BLOCK = "true"; + # CF_FORCE_INCLUDE_FILES = '' + # emi + # ''; + # }; + # extraOptions = defaultOptions; + # log-driver = "local"; + # environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; + #}; + #stoneblock-4 = { + # image = "itzg/minecraft-server:java25-graalvm"; + # volumes = [ + # "${minecraft_path}/stoneblock-4/modpacks:/modpacks:ro" + # "${minecraft_path}/stoneblock-4/data:/data" + # ]; + # hostname = "stoneblock-4"; + # environment = defaultEnv // { + # VERSION = "1.21.1"; + # CF_SLUG = "prominence-2-hasturian-era"; + # CF_FILENAME_MATCHER = "3.9.14hf"; + # USE_AIKAR_FLAGS = "false"; + # USE_MEOWICE_FLAGS = "true"; + # USE_MEOWICE_GRAALVM_FLAGS = "true"; + # DIFFICULTY = "hard"; + # ENABLE_COMMAND_BLOCK = "true"; + # CF_FORCE_INCLUDE_FILES = '' + # emi + # ''; + # }; + # extraOptions = defaultOptions; + # log-driver = "local"; + # environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; + #}; + submerged-2 = { image = "itzg/minecraft-server:java25-graalvm"; volumes = [ - "${minecraft_path}/prominence-ii/modpacks:/modpacks:ro" - "${minecraft_path}/prominence-ii/data:/data" + "${minecraft_path}/submerged-2/modpacks:/modpacks:ro" + "${minecraft_path}/submerged-2/data:/data" ]; - hostname = "pii"; + hostname = "submerged-2"; environment = defaultEnv // { - VERSION = "1.20.1"; - CF_SLUG = "prominence-2-hasturian-era"; - CF_FILENAME_MATCHER = "3.9.14hf"; + VERSION = "1.21.1"; + CF_SLUG = "submerged-2"; + CF_FILENAME_MATCHER = "B6.1"; USE_AIKAR_FLAGS = "false"; USE_MEOWICE_FLAGS = "true"; USE_MEOWICE_GRAALVM_FLAGS = "true"; DIFFICULTY = "hard"; ENABLE_COMMAND_BLOCK = "true"; - CF_FORCE_INCLUDE_FILES = '' - emi - ''; }; extraOptions = defaultOptions; log-driver = "local"; environmentFiles = [ config.sops.secrets."docker/minecraft".path ]; }; - #stop_signal: SIGTERM - #stop_grace_period: 5m - # 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 = { - defaultSopsFile = ../secrets.yaml; secrets = { "docker/minecraft".owner = "docker-service"; }; diff --git a/systems/palatine-hill/secrets.yaml b/systems/palatine-hill/secrets.yaml index c613fbe..ef8b67c 100644 --- a/systems/palatine-hill/secrets.yaml +++ b/systems/palatine-hill/secrets.yaml @@ -17,7 +17,7 @@ minio: credentials: ENC[AES256_GCM,data:5Z/cTmxSuMq8BfRgYLGZZJ7o6AtmrQM3yNjR17YHr29S7ZWvGsjfM7DsLKectem01nvv3HoT4uyWSdhkOmZahzDb5OF1NEgjJhLqkKlCETMu0mmpwe1cx6iOd7kjB3E6Az/MWpXqZ/TrryL9FrQD2nnx9bHyWWIHRQv8,iv:jiYZXfU+OssC0rh/3yFZLEzD1+5mVDDl6gQ3oyk76E4=,tag:bevDszFv1zSa+/2qQIgC0w==,type:str] loki: ENC[AES256_GCM,data:ShC6hfsKifVaxLWRo1fqaOpsrYh4+w==,iv:KVSlPd0mBvPZikg/Agnl6q0UhxTmsNOeYdercYOhqMg=,tag:cj6ex9m7vDjInTJDGUlqFQ==,type:str] docker: - minecraft: ENC[AES256_GCM,data:2k/m0ksnE92fACxQuBlOO72b19T7Nbnr58ezRddmKUVvePEgrdSnIsR3sh7PnmzwmG/ez0WTD+NKbtkQmRMDQ25vruA8gCf8Ig==,iv:X2SUidKTNAPZfbyiXFKprUbAhBxJcbF5bz+YTy4nuEA=,tag:AAvLXO888r9XvtnNfQgCpA==,type:str] + minecraft: ENC[AES256_GCM,data:krSM870t/IATwpUWNuKX8D5HHEvk+HeimKgodXssIYcBmdF1SZAwjUsSlx9fL3JiRtxfu0jSbhyD/2jLHMWqcix1WQGOVgs=,iv:ZTMxmzeSLQRCBF2t6r3dCDlcZ5BsBwZen6jOZN/HvGU=,tag:SES3lhRrRI8zBH1jnaV82w==,type:str] foundry: ENC[AES256_GCM,data:5Z0FvVhJBzTwDPRN6c//caZokiTnkdqiLGFFuyen+tYsdjbQ3AXH5y7HfxKbxsJvU5uShOuIg0jVMvow2NYmzyYDDKBKPOz0bgXOmFq06wzCJubjyZmR/mDcWBBDzAFzaazpyW8=,iv:6wLS00zhX0tjJUe5uADAjzEshJP8QOkF2i4Aw+Y9RSk=,tag:sNr/exY1u3evYGcImyCUlA==,type:str] nextcloud: ENC[AES256_GCM,data:dm2Cha+CvFORgdcBvJAzzdOGcJ95vLJYTZcUJnjNp6HOQIIoJrDone1NOAYJh9rdWG/17/ntOmd+TysAj4AsD0dw/PatZmy3I+dcVghkt2XNTc7jD64QjctIHzR+om1joAbKemG1R3St7qDU68TWYxoxIfYZcJvg3ds/lJcYgFRh079UZ/IRlGVR6sWPEXyY+UUrwtk0Fr+y8UtwwWZiLp0akUbIV06huRGiAp/PeWETuPPuacl2++ayIgJFZkJjUl/a52RI1Q0nLG5iyK6QYpY1JSRJTOkiQQ4PB5GRdLCdoM5/ZXTQ6gGcoM5jXFllsTn+yRicNRucuBp7Z2achbk6eITCdjjdXVI7zM4YXpzVLu5fJckLAu07aEIGYCBT7ZXd7TRgfB68POwtwaJGBozg+nuhq8xEH04yi8jFODH6aFplIgJ+bbaP72zw+92lzZa33FEtOwKdtx+YUv0eLLDJs+8Z6Sn6RyN8prwIz1/9LuIMx39g4R7id9W2bV2MXqTU4nN8f0TXWqe+hnb5pDLBaZOBMkwbRka6Vptsi4dbL5Lnexa2DoIHZ2unyxZ+4SkRt9LH39j8fXf2w5JPFCSLstf7+Zu7xzRS0TTCug7k,iv:oOWcFdQJb/+KZKJmQChhJ5jOCcM3o+ojZSMyiRnO9n8=,tag:PWGQkwPe0juLgAdlKiWKpg==,type:str] redis: ENC[AES256_GCM,data:c+55cN6IpUNeKd+wC2zv3eunYjBsmZtXTczokqaxB2Q=,iv:M3pwNUlT9kUMv4JDE6bp/gub9CdBGxdApIvpOt3JpgE=,tag:3rPlV3U0AP9zAeF7xDouKw==,type:str] @@ -53,8 +53,8 @@ sops: cXNZWmZqd0R0SmhINExscHBKWmxvblUKEFEQvt/zQFARba4S8vHz/1SoKdKg69At LZ58XQGOmlGbBhPr7EzYQ2XSY4flWbnnD174cmCR8DNFm15DsNA5fw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-01-10T05:52:21Z" - mac: ENC[AES256_GCM,data:DyLjQrIXJD7udT32xJ20WgCYr+4zXr7s0uuVMxOYSiC1VphhV+BQ2BgGF0bxAfx1n+JiO2BnyX8uD+z/iWh/k/9+UBGnL3MPJ5L5ffvno8hktVU9NHO72xkugYIkbSievTYrJGcSwWAsfJGTm4+1rG9GgcSoxIvRUoR6QJss22s=,iv:pHkPR0Va4bKjZVzNtvsDJ211ORNvNyZfWRf70OWI01w=,tag:/gEp09I+1nD6Cn6dPGZglA==,type:str] + lastmodified: "2026-01-17T01:50:50Z" + mac: ENC[AES256_GCM,data:8TGSqwEcfmrW1PjuzTVNyDTNs6s3oWbT0tI+rg7u2w5Dcw1EEU+SjJ6VpNY06AZHTjSD6E0O7NzUxybtMpslHUGitOGWwQCk+sbqRJuUseFe7bWFboEVoJpEoYGN5pnn52opMT+NeHGkXumaxjhDjCxfwn1RBHR7TgD4ZHEH6pE=,iv:szBUnn3HL/osWhmTwYmHrUghobWdBR60Lc6uUD/eGMY=,tag:6vgdJeJjL4ZYKc8WjixClg==,type:str] pgp: - created_at: "2024-11-28T18:56:39Z" enc: |-