dev/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

nixos/whale2: Update Simpcraft to 0.2.0
All checks were successful
CI / Check, build and cache Nix flake (push) Successful in 25m49s
Details

Browse Source
This commit is contained in:
Jack O'Sullivan 2024-01-10 01:10:13 +00:00
parent aad8adf5da
commit f90deabb50
2 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix
View File

@ -364,7 +364,7 @@ in
useACMEHost = pubDomain; useACMEHost = pubDomain;
}; };
"mc-rail.${pubDomain}" = { "mc-rail.${pubDomain}" = {
locations."/".proxyPass = "http://simpcraft-staging-oci.${domain}:3876"; locations."/".proxyPass = "http://simpcraft-oci.${domain}:3876";
useACMEHost = pubDomain; useACMEHost = pubDomain;
}; };

74
nixos/boxes/colony/vms/whale2/minecraft/default.nix
View File

@ -1,4 +1,4 @@
{ lib, config, allAssignments, ... }: { lib, pkgs, config, allAssignments, ... }:
let let
inherit (lib) concatStringsSep; inherit (lib) concatStringsSep;
inherit (lib.my) dockerNetAssignment; inherit (lib.my) dockerNetAssignment;
@ -18,18 +18,27 @@ let
"d6ec4c91-5da2-44eb-b89d-71dc8fe017a0" # Eefah98 "d6ec4c91-5da2-44eb-b89d-71dc8fe017a0" # Eefah98
"096a7348-fabe-4b2d-93fc-fd1fd5608fb0" # ToTheMoonStar "096a7348-fabe-4b2d-93fc-fd1fd5608fb0" # ToTheMoonStar
]; ];
fastback = {
gitConfig = pkgs.writeText "git-config" ''
[user]
email = "simpcraft@nul.ie"
name = "Simpcraft bot"
'';
};
in in
{ {
config = { config = {
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
simpcraft = { simpcraft = {
image = "ghcr.io/itzg/minecraft-server:2023.12.2-java17-alpine"; image = "git.nul.ie/dev/craftblock:2024.1.0-java17-alpine";
environment = { environment = {
TYPE = "MODRINTH"; TYPE = "MODRINTH";
EULA = "true"; EULA = "true";
ENABLE_QUERY = "true"; ENABLE_QUERY = "true";
ENABLE_RCON = "true";
MOTD = "§4§k----- §9S§ai§bm§cp§dc§er§fa§6f§5t §4§k-----"; MOTD = "§4§k----- §9S§ai§bm§cp§dc§er§fa§6f§5t §4§k-----";
ICON = "/ext/icon.png"; ICON = "/ext/icon.png";
@ -42,7 +51,7 @@ in
VIEW_DISTANCE = "20"; VIEW_DISTANCE = "20";
MAX_MEMORY = "6G"; MAX_MEMORY = "6G";
MODRINTH_MODPACK = "https://cdn.modrinth.com/data/CIYf3Hk8/versions/cdj2bSKg/Simpcraft-0.1.2.mrpack"; MODRINTH_MODPACK = "https://cdn.modrinth.com/data/CIYf3Hk8/versions/Ym3sIi6H/Simpcraft-0.2.0.mrpack";
TZ = "Europe/Dublin"; TZ = "Europe/Dublin";
}; };
@ -50,6 +59,7 @@ in
volumes = [ volumes = [
"minecraft_data:/data" "minecraft_data:/data"
"${./icon.png}:/ext/icon.png:ro" "${./icon.png}:/ext/icon.png:ro"
"${fastback.gitConfig}:/data/.config/git/config:ro"
]; ];
extraOptions = [ extraOptions = [
@ -57,42 +67,42 @@ in
]; ];
}; };
simpcraft-staging = { # simpcraft-staging = {
image = "git.nul.ie/dev/craftblock:2024.1.0-java17-alpine"; # image = "git.nul.ie/dev/craftblock:2024.1.0-java17-alpine";
environment = { # environment = {
TYPE = "MODRINTH"; # TYPE = "MODRINTH";
EULA = "true"; # EULA = "true";
ENABLE_QUERY = "true"; # ENABLE_QUERY = "true";
ENABLE_RCON = "true"; # ENABLE_RCON = "true";
MOTD = "§4§k----- §9S§ai§bm§cp§dc§er§fa§6f§5t [staging] §4§k-----"; # MOTD = "§4§k----- §9S§ai§bm§cp§dc§er§fa§6f§5t [staging] §4§k-----";
ICON = "/ext/icon.png"; # ICON = "/ext/icon.png";
EXISTING_WHITELIST_FILE = "SYNCHRONIZE"; # EXISTING_WHITELIST_FILE = "SYNCHRONIZE";
WHITELIST = whitelist; # WHITELIST = whitelist;
EXISTING_OPS_FILE = "SYNCHRONIZE"; # EXISTING_OPS_FILE = "SYNCHRONIZE";
OPS = op; # OPS = op;
DIFFICULTY = "normal"; # DIFFICULTY = "normal";
SPAWN_PROTECTION = "0"; # SPAWN_PROTECTION = "0";
VIEW_DISTANCE = "20"; # VIEW_DISTANCE = "20";
MAX_MEMORY = "4G"; # MAX_MEMORY = "4G";
MODRINTH_MODPACK = "https://cdn.modrinth.com/data/CIYf3Hk8/versions/Ym3sIi6H/Simpcraft-0.2.0.mrpack"; # MODRINTH_MODPACK = "https://cdn.modrinth.com/data/CIYf3Hk8/versions/Ym3sIi6H/Simpcraft-0.2.0.mrpack";
TZ = "Europe/Dublin"; # TZ = "Europe/Dublin";
}; # };
environmentFiles = [ config.age.secrets."whale2/simpcraft.env".path ]; # environmentFiles = [ config.age.secrets."whale2/simpcraft.env".path ];
volumes = [ # volumes = [
"minecraft_staging_data:/data" # "minecraft_staging_data:/data"
"${./icon.png}:/ext/icon.png:ro" # "${./icon.png}:/ext/icon.png:ro"
]; # ];
extraOptions = [ # extraOptions = [
''--network=colony:${dockerNetAssignment allAssignments "simpcraft-staging-oci"}'' # ''--network=colony:${dockerNetAssignment allAssignments "simpcraft-staging-oci"}''
]; # ];
}; # };
}; };
my = { my = {