summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2017-07-02 14:23:53 +0100
committerGitHub <noreply@github.com>2017-07-02 14:23:53 +0100
commite4ca35a4f6a6d0429cc344d163baa7c215596a61 (patch)
tree1a7fcc0638100a75dae2175909bb003aa16d3247 /nixos
parent8ad273d4f06004f31c2dc7e5eff87a9343376c47 (diff)
parent0dd204ebfe5500714ab82ba80ae6182a2fcc4ebf (diff)
downloadnixpkgs-e4ca35a4f6a6d0429cc344d163baa7c215596a61.tar
nixpkgs-e4ca35a4f6a6d0429cc344d163baa7c215596a61.tar.gz
nixpkgs-e4ca35a4f6a6d0429cc344d163baa7c215596a61.tar.bz2
nixpkgs-e4ca35a4f6a6d0429cc344d163baa7c215596a61.tar.lz
nixpkgs-e4ca35a4f6a6d0429cc344d163baa7c215596a61.tar.xz
nixpkgs-e4ca35a4f6a6d0429cc344d163baa7c215596a61.tar.zst
nixpkgs-e4ca35a4f6a6d0429cc344d163baa7c215596a61.zip
Merge pull request #26990 from jfrankenau/mpd-create-playlistDir
mpd service: Create playlist directory
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/audio/mpd.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 56af8fe152e..11628781bbd 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -10,9 +10,11 @@ let
   gid = config.ids.gids.mpd;
   cfg = config.services.mpd;
 
+  playlistDir = "${cfg.dataDir}/playlists";
+
   mpdConf = pkgs.writeText "mpd.conf" ''
     music_directory     "${cfg.musicDirectory}"
-    playlist_directory  "${cfg.dataDir}/playlists"
+    playlist_directory  "${playlistDir}"
     db_file             "${cfg.dbFile}"
     state_file          "${cfg.dataDir}/state"
     sticker_file        "${cfg.dataDir}/sticker.sql"
@@ -126,7 +128,10 @@ in {
       description = "Music Player Daemon";
       wantedBy = [ "multi-user.target" ];
 
-      preStart = "mkdir -p ${cfg.dataDir} && chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}";
+      preStart = ''
+        mkdir -p "${cfg.dataDir}" && chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}"
+        mkdir -p "${playlistDir}" && chown -R ${cfg.user}:${cfg.group} "${playlistDir}"
+      '';
       serviceConfig = {
         User = "${cfg.user}";
         PermissionsStartOnly = true;