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

nixos/mpd: remove credentialsFile in favor of credentials option

Browse Source
This commit is contained in:
sohalt 2020-12-26 17:53:01 +01:00
parent f7384470de
commit dcbfdf1a71
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/services/audio/mpd.nix
View File

@ -193,18 +193,6 @@ in {
]; ];
}; };
credentialsFile = mkOption {
type = types.path;
description = ''
Path to a file to be merged with the settings during the service startup.
Useful to merge a file which is better kept out of the Nix store
because it contains sensible data like MPD's password. Example may look like this:
<literal>password "myMpdPassword@read,add,control,admin"</literal>
'';
default = "/dev/null";
example = "/var/lib/secrets/mpd.conf";
};
fluidsynth = mkOption { fluidsynth = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -244,9 +232,8 @@ in {
User = "${cfg.user}"; User = "${cfg.user}";
ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /run/mpd/mpd.conf"; ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /run/mpd/mpd.conf";
ExecStartPre = pkgs.writeShellScript "mpd-start-pre" '' ExecStartPre = pkgs.writeShellScript "mpd-start-pre" ''
set -xeuo pipefail set -euo pipefail
umask 077 install -m 600 ${mpdConf} /run/mpd/mpd.conf
cat ${mpdConf} ${cfg.credentialsFile} > /run/mpd/mpd.conf
${pkgs.replace}/bin/replace-literal -fe ${ ${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