Merge branch 'master' into harden

diff --cc contrib/ympd.default
index d97ac7380e6673fbd23664fee850bd5cdf8f9fa5,f0cd0f5d7973794226799e570649d45db72922f3..b1bf9fdd65ce4153d4f31ff7afe0ca46bcc15f52
--- 1/contrib/ympd.default
--- 2/contrib/ympd.default
+++ b/contrib/ympd.default
@@@ -2,4 -2,7 +2,6 @@@ MPD_HOST=localhos
  MPD_PORT=6600
  MPD_PASSWORD=
  WEB_PORT=8080
 -YMPD_USER=nobody
  DIRBLE_API_TOKEN=2e223c9909593b94fc6577361a
+ #DIGEST=--digest /path/to/htdigest
+ #LOCALPORT=--localport 8080

diff --cc contrib/ympd.service
index cb1abdccffd0ff852ee22b4bde98d7b8bbb84926,43a9e1aa71689c8bb5feb9cd6fd53305ceaeb80e..5037dad0afe46cd9249504677fd0e5ed0b8cba8b
--- 1/contrib/ympd.service
--- 2/contrib/ympd.service
+++ b/contrib/ympd.service
@@@ -29,8 -9,10 +29,10 @@@ Environment=MPD_PASSWORD
  Environment=WEB_PORT=8080
  Environment=YMPD_USER=nobody
  Environment=DIRBLE_API_TOKEN=2e223c9909593b94fc6577361a
+ Environment=DIGEST=
+ Environment=LOCALPORT=
  EnvironmentFile=/etc/default/ympd
- ExecStart=/usr/bin/ympd --user $USER --mpdpass "$MPD_PASSWORD" --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKEN
 -ExecStart=/usr/bin/ympd --user $YMPD_USER --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKEN $DIGEST $LOCALPORT
++ExecStart=/usr/bin/ympd --user $USER --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKEN $DIGEST $LOCALPORT
  Type=simple
  
  [Install]