refactor: reCapcha -> turnstile
runner nix smoke / nix label and flake smoke (push) Failing after 1m16s

This commit is contained in:
2026-09-13 09:37:22 +00:00
parent 1e973e7b33
commit 1d19d091e6
3 changed files with 23 additions and 10 deletions
+1 -1
View File
@@ -161,7 +161,7 @@ in
"prefixpath=${cfg.storageBox.subdirectory}"; "prefixpath=${cfg.storageBox.subdirectory}";
}; };
systemd.services.immich-server.serviceConfig.RequiresMountsFor = lib.mkIf cfg.storageBox.enable [ systemd.services.immich-server.unitConfig.RequiresMountsFor = lib.mkIf cfg.storageBox.enable [
cfg.mediaLocation cfg.mediaLocation
]; ];
}; };
@@ -16,15 +16,24 @@
name: value: name: value:
"${name}=${if builtins.isBool value then lib.boolToString value else toString value}" "${name}=${if builtins.isBool value then lib.boolToString value else toString value}"
) serverProperties; ) serverProperties;
sandboxValueType = lib.types.oneOf [
lib.types.bool
lib.types.int
lib.types.float
lib.types.str
(lib.types.attrsOf sandboxValueType)
];
luaValue = value: luaValue = value:
if builtins.isBool value then if builtins.isBool value then
lib.boolToString value lib.boolToString value
else if builtins.isInt value then else if builtins.isInt value || builtins.isFloat value then
toString value toString value
else if builtins.isAttrs value then
"{ ${lib.concatStringsSep " " (lib.mapAttrsToList (name: child: "[${luaValue name}] = ${luaValue child},") value)} }"
else else
"\"${lib.replaceStrings [ "\\" "\"" "\n" "\r" ] [ "\\\\" "\\\"" "\\n" "\\r" ] value}\""; "\"${lib.replaceStrings [ "\\" "\"" "\n" "\r" ] [ "\\\\" "\\\"" "\\n" "\\r" ] value}\"";
sandboxConfigLines = lib.mapAttrsToList ( sandboxConfigLines = lib.mapAttrsToList (
name: value: "${name} = ${luaValue value}," name: value: "[${luaValue name}] = ${luaValue value},"
) cfg.sandboxProperties; ) cfg.sandboxProperties;
zomboidDir = "${cfg.dataDir}/Zomboid"; zomboidDir = "${cfg.dataDir}/Zomboid";
adminPasswordFile = "${cfg.dataDir}/admin-password"; adminPasswordFile = "${cfg.dataDir}/admin-password";
@@ -112,13 +121,7 @@ in {
}; };
sandboxProperties = lib.mkOption { sandboxProperties = lib.mkOption {
type = lib.types.attrsOf ( type = lib.types.attrsOf sandboxValueType;
lib.types.oneOf [
lib.types.bool
lib.types.int
lib.types.str
]
);
default = { }; default = { };
description = "Values for the Project Zomboid SandboxVars.lua file."; description = "Values for the Project Zomboid SandboxVars.lua file.";
}; };
+10
View File
@@ -100,10 +100,20 @@ in {
Map = "map_distanciado;Muldraugh, KY"; Map = "map_distanciado;Muldraugh, KY";
DoLuaChecksum = false; DoLuaChecksum = false;
Public = true; Public = true;
AntiCheatPermission = 3;
}; };
sandboxProperties = { sandboxProperties = {
StartMonth = 12; StartMonth = 12;
StartDay = 1; StartDay = 1;
WaterShut = 3;
WaterShutModifier = 60;
ElecShut = 3;
ElecShutModifier = 60;
MinutesPerPage = 0.5;
ZombieLore = {
Transmission = 4;
Mortality = 7;
};
}; };
workshopItems = [ workshopItems = [
"2210760610" # Cryogenic Winter +Easy/Hard Modes "2210760610" # Cryogenic Winter +Easy/Hard Modes