public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/mpd: use credentials only if needed

Browse Source
This commit is contained in:
Doron Behar
2021-01-11 09:07:34 +02:00
parent d085417683
commit 4ce7f28508
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/audio/mpd.nix
+4 -3
View File
@@ -40,7 +40,7 @@ let
} }
''} ''}
${credentialsPlaceholder cfg.credentials} ${optionalString (cfg.credentials != []) (credentialsPlaceholder cfg.credentials)}
${cfg.extraConfig} ${cfg.extraConfig}
''; '';
@@ -234,9 +234,10 @@ in {
ExecStartPre = pkgs.writeShellScript "mpd-start-pre" '' ExecStartPre = pkgs.writeShellScript "mpd-start-pre" ''
set -euo pipefail set -euo pipefail
install -m 600 ${mpdConf} /run/mpd/mpd.conf 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) concatStringsSep " -a " (imap0 (i: c: "\"{{password-${toString i}}}\" \"$(cat ${c.passwordFile})\"") cfg.credentials)
} /run/mpd/mpd.conf } /run/mpd/mpd.conf"}
''; '';
RuntimeDirectory = "mpd"; RuntimeDirectory = "mpd";
Type = "notify"; Type = "notify";