From 3d149702edf0d59e2ac783413fcd308ffd11f3c9 Mon Sep 17 00:00:00 2001
From: ehmry <ehmry@posteo.net>
Date: Tue, 2 Jul 2019 21:41:35 +0200
Subject: [PATCH] Move generic MPD satellite config to /mpd.nix

---
 hosts/pulsebert/configuration.nix | 49 +++++++------------------------
 hosts/pulsebert/home.nix          |  2 ++
 mpd.nix                           |  4 +--
 3 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/hosts/pulsebert/configuration.nix b/hosts/pulsebert/configuration.nix
index 40b71fe8..2b6f3a1d 100644
--- a/hosts/pulsebert/configuration.nix
+++ b/hosts/pulsebert/configuration.nix
@@ -14,6 +14,7 @@ in {
       ../../lib/admins.nix
       ../../common.nix
       ../../users.nix
+      ../../mpd.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
@@ -55,6 +56,7 @@ in {
     home-manager
     mumble
     ncpamixer
+    ffmpeg
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -76,7 +78,6 @@ in {
     4713 # PulseAudio
     631 # cups
     80 443 # Web/ympd
-    6600 # mpd
     5000 # shairport
   ];
   networking.firewall.allowedUDPPorts = [
@@ -184,15 +185,9 @@ in {
 
   # vater hoerte, dass menschen im space gern mpd fuer das abspielen von musik erwarten wuerden
   ####	https://nixos.org/nixos/options.html#services.mpd.enable
-  services.mpd = { 
-    enable=true;
-    dbFile = null;
-    network.listenAddress = "any";
-    musicDirectory = "/mnt/storage/Music";
-####    musicDirectory = "nfs://storage.hq.c3d2.de:/mnt/zroot/storage/rpool/Music";
-    extraConfig = ''
-####	music_directory "nfs://storage.hq.c3d2.de:/mnt/zroot/storage/rpool/Music"
-####
+  # See ../../mpd.nix
+  services.mpd.extraConfig =
+    ''
 	audio_output {
 		type "pulse"
 		name "/proc"
@@ -203,25 +198,7 @@ in {
 		name "SDK"
 		server "dacbert.hq.c3d2.de"
 	}
-
-####	mpd startet bei der option nicht mehr
-	database {
-		plugin "proxy"
-    	####	vater was here!
-    	####	jail (auf storage)
-    	####	externe erstellung der datenbank von mpd in der naehe der ablage der daten
-		host "172.22.99.98"
-	}
-
-####	ausschalten der automatischen aktualisierung der datenbank von mpd
-####	angeblich gibt es 2019-02-13 probleme, die zum absturz vom dienst mpd fuehren
-####	wenn das problem behoben ist, dann kann die option wieder entfernt werden
-	auto_update "no"
-	'';
-  };
-
-  # mpd likes to crash a lot while indexing, so...
-  systemd.services.mpd.serviceConfig.Restart="on-failure";
+    '';
 
   services.caddy = {
     enable = true;
@@ -240,14 +217,11 @@ in {
 
 
   fileSystems."/mnt/storage" = {
-    device = "storage.hq.c3d2.de:/mnt/zroot/storage/rpool";
-    fsType = "nfs";
-  };
-
-####	nur zum spielen mit dem bereitstellen von einer per nfs angebundenen datei als datenbank fuer mpd
-  fileSystems."/mnt/service-data/mpd_index" = {
-    device = "storage.hq.c3d2.de:/mnt/zroot/iocage/jails/mpd_index/root/var/mpd/.mpd";
-    fsType = "nfs";
+    #device = "storage-ng.hq.c3d2.de:/mnt/zroot/storage/rpool";
+    #device = "storage-ng.hq.c3d2.de:/c3d2/rpool";
+    device = "172.22.99.13:6789,172.22.99.15:6789,172.22.99.16:6789:/c3d2/rpool";
+    fsType = "ceph";
+    options = [ "rw" "relatime" "name=public" "secret=AQDgER1chJcMORAAK1ysRTN59B5x/MyniwVXFQ==" "acl" "wsize=16777216" "_netdev" ];
   };
 
   # MPD music playing daemon with webinterface
@@ -265,5 +239,4 @@ in {
       };
     });
   };
-  
 }
diff --git a/hosts/pulsebert/home.nix b/hosts/pulsebert/home.nix
index f55cd737..5821e300 100644
--- a/hosts/pulsebert/home.nix
+++ b/hosts/pulsebert/home.nix
@@ -11,5 +11,7 @@
     screen
     tmux
     pulsemixer
+    ncpamixer
+    python35.withPackages(ps: with ps; [ youtube-dl ])
   ];
 }
diff --git a/mpd.nix b/mpd.nix
index 55674d29..17e54bd5 100644
--- a/mpd.nix
+++ b/mpd.nix
@@ -12,7 +12,7 @@ let
       extraConfig = ''
         database {
           plugin "proxy"
-          host "172.22.99.20"
+          host "storage-ng.hq.c3d2.de"
         }
       '';
     };
@@ -24,5 +24,5 @@ in
   });
 
   networking.firewall.allowedTCPPorts =
-   [ config.mpd.network.port ];
+   [ config.services.mpd.network.port ];
 }