b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos/asf: ipcPasswordFile use nullOr

Browse source
This commit is contained in:
lom 2022-06-03 08:13:08 -06:00
parent 032f15e566
commit 0df7cba1b0
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/services/games/asf.nix
View file

@ -13,7 +13,7 @@ let
# is in theory not needed as this is already the default for default builds # is in theory not needed as this is already the default for default builds
UpdateChannel = 0; UpdateChannel = 0;
Headless = true; Headless = true;
} // lib.optionalAttrs (cfg.ipcPasswordFile != "") { } // lib.optionalAttrs (cfg.ipcPasswordFile != null) {
IPCPassword = "#ipcPassword#"; IPCPassword = "#ipcPassword#";
}); });
@ -94,7 +94,8 @@ in
}; };
ipcPasswordFile = mkOption { ipcPasswordFile = mkOption {
type = types.path; type = types.nullOr types.path;
default = null;
description = "Path to a file containig the password. The file must be readable by the <literal>asf</literal> user/group."; description = "Path to a file containig the password. The file must be readable by the <literal>asf</literal> user/group.";
}; };
@ -225,7 +226,10 @@ in
mkdir -p config mkdir -p config
cp --no-preserve=mode ${asf-config} config/ASF.json cp --no-preserve=mode ${asf-config} config/ASF.json
${replaceSecretBin} '#ipcPassword#' '${cfg.ipcPasswordFile}' config/ASF.json
${optionalString (cfg.ipcPasswordFile != null) ''
${replaceSecretBin} '#ipcPassword#' '${cfg.ipcPasswordFile}' config/ASF.json
''}
${optionalString (cfg.ipcSettings != {}) '' ${optionalString (cfg.ipcSettings != {}) ''
ln -fs ${ipc-config} config/IPC.config ln -fs ${ipc-config} config/IPC.config