Merge pull request 'feature/pii' (#178) from feature/pii into main
All checks were successful
Check flake.lock / Check health of `flake.lock` (push) Successful in 9s
Check Nix flake / Perform Nix flake checks (push) Successful in 3m33s
Update flakes / update_lockfile (push) Successful in 9m52s

Reviewed-on: #178
This commit was merged in pull request #178.
This commit is contained in:
2026-01-19 21:14:06 -05:00

View File

@@ -79,54 +79,53 @@ in
# log-driver = "local";
# environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
#};
#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 ];
#};
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";
MEMORY = "8G";
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 = "ftb-stoneblock-4";
CF_FILENAME_MATCHER = "1.6.0";
MEMORY = "8G";
USE_AIKAR_FLAGS = "false";
USE_MEOWICE_FLAGS = "true";
USE_MEOWICE_GRAALVM_FLAGS = "true";
DIFFICULTY = "hard";
ENABLE_COMMAND_BLOCK = "true";
};
extraOptions = defaultOptions;
log-driver = "local";
environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
};
submerged-2 = {
image = "itzg/minecraft-server:java25-graalvm";
volumes = [