From 4ce7f285080b9054d287e63ad8ff8a80c19b1a22 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 10 Jan 2021 23:56:39 +0200 Subject: [PATCH] nixos/mpd: use credentials only if needed --- nixos/modules/services/audio/mpd.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index c8e5045f6dc..2e5953dc6f4 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -40,7 +40,7 @@ let } ''} - ${credentialsPlaceholder cfg.credentials} + ${optionalString (cfg.credentials != []) (credentialsPlaceholder cfg.credentials)} ${cfg.extraConfig} ''; @@ -234,9 +234,10 @@ in { ExecStartPre = pkgs.writeShellScript "mpd-start-pre" '' set -euo pipefail install -m 600 ${mpdConf} /run/mpd/mpd.conf - ${pkgs.replace}/bin/replace-literal -fe ${ + ${optionalString (cfg.credentials != []) + "${pkgs.replace}/bin/replace-literal -fe ${ concatStringsSep " -a " (imap0 (i: c: "\"{{password-${toString i}}}\" \"$(cat ${c.passwordFile})\"") cfg.credentials) - } /run/mpd/mpd.conf + } /run/mpd/mpd.conf"} ''; RuntimeDirectory = "mpd"; Type = "notify";