chore(minecraft): cache mounts

This commit is contained in:
arcnmx 2024-09-25 11:48:52 -07:00
parent 8e980b85fc
commit 3f6446744b

View file

@ -49,6 +49,10 @@ in {
}; };
Matricariac = { Matricariac = {
uuid = "e6204250-05dc-4f4a-890a-71619170a321"; uuid = "e6204250-05dc-4f4a-890a-71619170a321";
permissionLevel = 2;
};
Kaosubaloo = {
uuid = "1340bc67-5296-4f6d-9643-29011971f88e";
permissionLevel = 1; # 2? permissionLevel = 1; # 2?
}; };
}; };
@ -64,9 +68,19 @@ in {
systemd = mkIf cfg.enable { systemd = mkIf cfg.enable {
services.minecraft-java-server = { services.minecraft-java-server = {
# TODO: confinement.enable = true; # TODO: confinement.enable = true;
gensokyo-zone.sharedMounts."minecraft/java/marka-server" = {config, ...}: { gensokyo-zone = {
root = config.rootDir + "/minecraft/java"; sharedMounts."minecraft/java/marka-server" = {config, ...}: {
path = mkDefault cfg.dataDir; root = config.rootDir + "/minecraft/java";
path = mkDefault cfg.dataDir;
};
cacheMounts = {
"minecraft/dynmap" = mkIf enableDynmap {
path = mkDefault "${cfg.dataDir}/dynmap";
};
"minecraft/bluemap" = mkIf enableBluemap {
path = mkDefault "${cfg.dataDir}/bluemap";
};
};
}; };
preStart = let preStart = let
forgeDir = { forgeDir = {
@ -103,11 +117,18 @@ in {
]) ])
]; ];
LogFilterPatterns = [ LogFilterPatterns = [
"~.*Invalid modellist patch"
"~.*Invalid modellist patch.*" "~.*Invalid modellist patch.*"
]; ];
}; };
}; };
# TODO: tmpfiles.rules = ["d ${backupsDir} 775 ${cfg.user} admin - -"]; tmpfiles.rules = let
inherit (config.systemd.services.minecraft-java-server.gensokyo-zone) cacheMounts;
in mkMerge [
#["d ${backupsDir} 775 ${cfg.user} ${cfg.group} - -"]
(mkIf enableDynmap ["d ${cacheMounts."minecraft/dynmap".source} 750 ${cfg.user} ${cfg.group} - -"])
(mkIf enableBluemap ["d ${cacheMounts."minecraft/bluemap".source} 750 ${cfg.user} ${cfg.group} - -"])
];
}; };
networking.firewall = mkIf cfg.enable { networking.firewall = mkIf cfg.enable {
interfaces.local = { interfaces.local = {