Use sockets instead of ports in mpd

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / tools / ympd.nix

diff --git a/nixops/modules/websites/tools/tools/ympd.nix b/nixops/modules/websites/tools/tools/ympd.nix
index 613a171c6c8275898f6a86cf479c3f888659cd8f..b54c48665d893638cd160cd330078ea973d324f5 100644 (file)
--- a/nixops/modules/websites/tools/tools/ympd.nix
+++ b/nixops/modules/websites/tools/tools/ympd.nix
@@ -3,10 +3,8 @@ let
   ympd = rec {
     config = {
       webPort = "localhost:${env.listenPort}";
-      mpd = {
-        host = "${env.mpd.host} --mpdpass ${env.mpd.password}";
-        port = env.mpd.port;
-      };
+      host = env.mpd.host;
+      port = env.mpd.port;
     };
     apache = {
       modules = [
@@ -28,12 +26,12 @@ let
           ProxyPass ws://${config.webPort}/ws
         </Location>
         <Location "/mpd/music.mp3">
-          ProxyPass http://localhost:${env.mp3port}/
-          ProxyPassReverse http://localhost:${env.mp3port}/
+          ProxyPass unix:///run/mpd/mp3.sock|http://tools.immae.eu/
+          ProxyPassReverse unix:///run/mpd/mp3.sock|http://tools.immae.eu/
         </Location>
         <Location "/mpd/music.ogg">
-          ProxyPass http://localhost:${env.oggport}/
-          ProxyPassReverse http://localhost:${env.oggport}/
+          ProxyPass unix:///run/mpd/ogg.sock|http://tools.immae.eu/
+          ProxyPassReverse unix:///run/mpd/ogg.sock|http://tools.immae.eu/
         </Location>
       '';
     };