diff --git a/playbooks/mpdf.conf.j2 b/playbooks/mpdf.conf.j2 index 16aaa1b..d6c1c2d 100644 --- a/playbooks/mpdf.conf.j2 +++ b/playbooks/mpdf.conf.j2 @@ -66,7 +66,7 @@ sticker_file {{ sticker_file }} # initialization. This setting is disabled by default and MPD is run as the # current user. # -user "{{ pillar['mpd']['user']}}" +user {{ user}} # # This setting specifies the group that MPD will run as. If not specified @@ -75,7 +75,7 @@ user "{{ pillar['mpd']['user']}}" # have permission to use sound card. # #group "nogroup" -group "{{ pillar['mpd']['group'] }}" +group {{ group }} # # This setting sets the address for the daemon to listen on. Careful attention # should be paid if this is assigned to anything other then the default, any. @@ -83,7 +83,7 @@ group "{{ pillar['mpd']['group'] }}" # to have mpd listen on every address # # For network -bind_to_address "{{ pillar['mpd']['bind_to_address'] }}" +bind_to_address {{ bind_to_address }} # # And for Unix Socket #bind_to_address "/var/run/mpd/socket" @@ -92,7 +92,7 @@ bind_to_address "{{ pillar['mpd']['bind_to_address'] }}" # to. # #port "6600" -port "{{ pillar['mpd']['port'] }}" +port {{ port }} # # This setting controls the type of information which is logged. Available @@ -101,7 +101,7 @@ port "{{ pillar['mpd']['port'] }}" # available resources on limited hardware storage. # #log_level "default" -log_level "{{ pillar['mpd']['log_level'] }}" +log_level {{ log_level }}" # # If you have a problem with your MP3s ending abruptly it is recommended that @@ -111,35 +111,35 @@ log_level "{{ pillar['mpd']['log_level'] }}" # point gapless MP3 playback can be enabled. # #gapless_mp3_playback "yes" -gapless_mp3_playback "{{ pillar['mpd']['gapless_mp3_playback'] }}" +gapless_mp3_playback {{ gapless_mp3_playback }} # # This setting enables MPD to create playlists in a format usable by other # music players. # #save_absolute_paths_in_playlists "no" -save_absolute_paths_in_playlists "{{ pillar['mpd']['save_absolute_paths_in_playlists'] }}" +save_absolute_paths_in_playlists {{ save_absolute_paths_in_playlists }} # # This setting defines a list of tag types that will be extracted during the # audio file discovery process. Optionally, 'comment' can be added to this # list. # #metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc" -metadata_to_use "{{ pillar['mpd']['metadata_to_use'] }}" +metadata_to_use {{ metadata_to_use }} # # This setting enables automatic update of MPD's database when files in # music_directory are changed. # #auto_update "yes" -auto_update "{{ pillar['mpd']['auto_update'] }}" +auto_update {{ auto_update }} # # Limit the depth of the directories being watched, 0 means only watch # the music directory itself. There is no limit by default. # #auto_update_depth "3" -auto_update_depth "{{ pillar['mpd']['auto_update_depth'] }}" +auto_update_depth {{ auto_update_depth }} # ############################################################################### @@ -151,14 +151,14 @@ auto_update_depth "{{ pillar['mpd']['auto_update_depth'] }}" # symbolic links outside of the configured music_directory. # #follow_outside_symlinks "yes" -follow_outside_symlinks "{{ pillar['mpd']['follow_outside_symlinks'] }}" +follow_outside_symlinks {{ follow_outside_symlinks }} # # If this setting is set to "yes", MPD will discover audio files by following # symbolic links inside of the configured music_directory. # #follow_inside_symlinks "yes" -follow_inside_symlinks "{{ pillar['mpd']['follow_inside_symlinks'] }}" +follow_inside_symlinks {{ follow_inside_symlinks }} # ############################################################################### @@ -170,13 +170,13 @@ follow_inside_symlinks "{{ pillar['mpd']['follow_inside_symlinks'] }}" # Zeroconf / Avahi. # #zeroconf_enabled "yes" -zeroconf_enabled "{{ pillar['mpd']['zeroconf_enabled'] }}" +zeroconf_enabled {{ zeroconf_enabled }} # # The argument to this setting will be the Zeroconf / Avahi unique name for # this MPD server on the network. # #zeroconf_name "Music Player" -zeroconf_name "{{ pillar['mpd']['zeroconf_name'] }}" +zeroconf_name {{ zeroconf_name }} # ############################################################################### @@ -192,7 +192,7 @@ password "HelloKitty@read,add,control,admin" # This setting specifies the permissions a user has who has not yet logged in. # #default_permissions "read,add,control,admin" -default_permissions "{{ pillar['mpd']['default_permissions'] }}" +default_permissions {{ default_permissions }} # ############################################################################### @@ -281,10 +281,10 @@ audio_output { type "httpd" always_on "yes" enabled "yes" - name "My HTTP Stream" + name "{{ Stream }}" encoder "lame" # optional, vorbis or lame - port "8000" - bind_to_address "0.0.0.0" # optional, IPv4 or IPv6 + port "{{ port }}" + bind_to_address "{{ bind_address }}" # optional, IPv4 or IPv6 quality "3.0" # do not define if bitrate is defined # bitrate "128" # do not define if quality is defined # format "44100:16:1" @@ -292,9 +292,9 @@ audio_output { } # An example of a pulseaudio output (streaming to a remote pulseaudio server) # -audio_output { - type "pulse" - name "My Pulse Output" +#audio_output { +# type "pulse" +# name "My Pulse Output" # server "remote_server" # optional # sink "remote_server_sink" # optional } @@ -360,7 +360,7 @@ audio_output { # #mixer_type "disabled" # -mixer_type "{{ pillar['mpd']['mixer_type']}}" +mixer_type {{ mixer_type }} ############################################################################### @@ -372,20 +372,20 @@ mixer_type "{{ pillar['mpd']['mixer_type']}}" # details. This setting is disabled by default. # #replaygain "album" -replaygain "{{ pillar['mpd']['replaygain'] }}" +replaygain {{ replaygain }} # # This setting sets the pre-amp used for files that have ReplayGain tags. By # default this setting is disabled. # #replaygain_preamp "0" -replaygain_preamp "{{ pillar['mpd']['replaygain_preamp'] }}" +replaygain_preamp {{ replaygain_preamp }} # # This setting enables on-the-fly normalization volume adjustment. This will # result in the volume of all playing audio to be adjusted so the output has # equal "loudness". This setting is disabled by default. # #volume_normalization "no" -volume_normalization "{{ pillar['mpd']['volume_normalization'] }}" +volume_normalization {{ volume_normalization }} # ############################################################################### @@ -397,14 +397,14 @@ volume_normalization "{{ pillar['mpd']['volume_normalization'] }}" # are doing. # #audio_buffer_size "2048" -audio_buffer_size "{{ pillar['mpd']['audio_buffer_size'] }}" +audio_buffer_size {{ audio_buffer_size }} # # This setting controls the percentage of the buffer which is filled before # beginning to play. Increasing this reduces the chance of audio file skipping, # at the cost of increased time prior to audio playback. # #buffer_before_play "10%" -buffer_before_play "{{ pillar['mpd']['buffer_before_play'] }}" +buffer_before_play {{ buffer_before_play }} # ###############################################################################