gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(minecraft): pack url moved to pages

Browse source
This commit is contained in:
arcnmx 2024-09-30 21:00:44 -07:00
parent 2ad47fcd0e
commit a5966c0724
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/nixos/minecraft/java.nix
View file

@ -146,13 +146,15 @@ in {
map (argsFile: "@${argsFile}") cfg.argsFiles
++ cfg.jvmOpts;
execStop = pkgs.writeShellScriptBin "minecraft-java-stop" ''
echo /stop > ${config.systemd.sockets.minecraft-java-server.socketConfig.ListenFIFO}
echo /stop > ${config.systemd.sockets.minecraft-java-server.socketConfig.ListenFIFO} || true
# Wait for the PID of the minecraft server to disappear before
# returning, so systemd doesn't attempt to SIGKILL it.
while kill -0 "$1" 2> /dev/null; do
sleep 1s
done
if [[ -n $1 ]]; then
# Wait for the PID of the minecraft server to disappear before
# returning, so systemd doesn't attempt to SIGKILL it.
while kill -0 "$1" 2> /dev/null; do
sleep 1s
done
fi
'';
in {
description = "Minecraft Kat Kitchen Server";
@ -177,7 +179,7 @@ in {
"${writeWhiteList cfg.allowPlayers}:${cfg.dataDir}/whitelist.json"
"${writeOps cfg.allowPlayers}:${cfg.dataDir}/ops.json"
];
ExecStop = "${getExe execStop} $MAINPID";
ExecStop = ''${getExe execStop} "$MAINPID"'';
Restart = "always";
User = cfg.user;
WorkingDirectory = cfg.dataDir;

5
nixos/minecraft/java.nix
View file

@ -22,7 +22,10 @@
owner = "kittywitch";
repo = "minecraft-modpack";
branch = "marka-${versions.majorMinor mcVersion}";
packUrl = "https://raw.githubusercontent.com/${owner}/${repo}/refs/heads/${branch}/pack.toml";
pages = true;
packUrl = if pages
then "https://${owner}.github.io/${repo}/pack.toml"
else "https://raw.githubusercontent.com/${owner}/${repo}/refs/heads/${branch}/pack.toml";
};
in {
services.minecraft-java-server = {