Setup mpd and pulseaudio integration using tcp

1 files changed, 18 insertions, 2 deletions

diff --git a/manifests/all.pp b/manifests/all.pp
index 3680464..acf8188 100644
--- a/manifests/all.pp
+++ b/manifests/all.pp
@@ -10,8 +10,8 @@ class mpd::all {
     groups  => [ 'audio', 'pulse', 'pulse-access' ],
   }
 
-  # Ensure pulseaudio is running systemwide so both mpd and users
-  # can share audio control.
+  # In the past we ensured pulseaudio were running systemwide
+  # so both mpd and users can share audio control.
   #
   # This could be managed elsewhere.
   file { '/etc/default/pulseaudio':
@@ -22,4 +22,20 @@ class mpd::all {
     notify => Service['mpd'],
     source => [ "puppet:///modules/mpd/pulseaudio" ],
   }
+
+  # When run as its own user as per the wiki instructions, mpd will be unable to
+  # send sound to another user's pulseaudio server. Rather than setting up
+  # pulseaudio as a system-wide daemon, a practice strongly discouraged by
+  # upstream, you can instead configure mpd to use pulseaudio's tcp module to send
+  # sound to localhost.
+  #
+  # See https://wiki.archlinux.org/index.php/Music_Player_Daemon/Tips_and_tricks#Local_.28with_separate_mpd_user.29
+  file { '/etc/pulse/default.pa':
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => 0644,
+    notify => Service['mpd'],
+    source => [ "puppet:///modules/mpd/default.pa" ],
+  }
 }