From 0df7cba1b0ad4dc019a54aa2fec107a8ae5bf404 Mon Sep 17 00:00:00 2001 From: lom Date: Fri, 3 Jun 2022 08:13:08 -0600 Subject: [PATCH] nixos/asf: ipcPasswordFile use nullOr --- nixos/modules/services/games/asf.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/games/asf.nix b/nixos/modules/services/games/asf.nix index 86845fe3b55..ed1a5544d7a 100644 --- a/nixos/modules/services/games/asf.nix +++ b/nixos/modules/services/games/asf.nix @@ -13,7 +13,7 @@ let # is in theory not needed as this is already the default for default builds UpdateChannel = 0; Headless = true; - } // lib.optionalAttrs (cfg.ipcPasswordFile != "") { + } // lib.optionalAttrs (cfg.ipcPasswordFile != null) { IPCPassword = "#ipcPassword#"; }); @@ -94,7 +94,8 @@ in }; 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 asf user/group."; }; @@ -225,7 +226,10 @@ in mkdir -p config 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 != {}) '' ln -fs ${ipc-config} config/IPC.config