wip daapd internet-accessible

daapd.env.sample

@@ -0,0 +1 @@
+ADMIN_PASSWORD=

daapd/Dockerfile

@@ -15,8 +15,10 @@ RUN apt-get install -y \
     libasound2-dev libmxml-dev libgcrypt11-dev libavahi-client-dev zlib1g-dev \
     libevent-dev libplist-dev libsodium-dev libjson-c-dev libwebsockets-dev libcurl4-openssl-dev
 
-RUN git clone https://github.com/ejurgensen/forked-daapd.git &&\
+RUN git clone https://github.com/tylerball/forked-daapd.git &&\
   cd forked-daapd &&\
+  git checkout configurable-websocket-protocol &&\
+  git pull &&\
   autoreconf -i &&\
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-lastfm --enable-mpd &&\
   make &&\

daapd/forked-daapd.conf

@@ -6,6 +6,8 @@ general {
   ipv6 = no
   cache_path = "/home/tball/daapd/dbase_and_logs/cache.db"
   trusted_networks = { "localhost", "192.168", "172", "fd" }
+  speaker_autoselect = no
+  admin_password = "placeholder"
 }
 
 library {

daapd/start.sh

@@ -6,8 +6,7 @@ mkdir -p /cache/forked-daapd
 chown -R daapd /cache/forked-daapd
 chmod -R u+rw /cache/forked-daapd
 
-sed -i -e "s/name = \"Music Server\"/name = \"${MUSIC_SERVER_NAME:-Music Server}\"/" /etc/forked-daapd.conf
-sed -i -e "s:/media:${MUSIC_SERVER_DATA:-/media}:" /etc/forked-daapd.conf
+sed -i -e "s/admin_password = \"placeholder\"/admin_password = \"${ADMIN_PASSWORD:-}\"/" /etc/forked-daapd.conf
 
 [ -d "/var/run" ] && rm -rf /var/run/*
 mkdir -p /var/run/dbus

docker-compose.yml

@@ -13,6 +13,7 @@ services:
       - 80:80
       - 443:443
       - 8080:8080
+      # - 3688:3688
     env_file:
       - ./traefik.env
     volumes:
@@ -65,7 +66,7 @@ services:
       - 8123:8123
     environment:
       - TZ=America/Toronto
-    restart: unless-stopped
+    restart: always
 
   spotify:
     container_name: spotify
@@ -95,15 +96,14 @@ services:
     container_name: daapd
     build: daapd
     network_mode: host
-    ports:
-      - 3689:3689
-      - 6600:6600
     volumes:
       - /mnt/pool/tunes:/mnt/pool/tunes:ro
       - ./daapd/forked-daapd.conf:/etc/forked-daapd.conf
     environment:
       - MEDIA_SERVER_NAME=Home
       - PUID=1000
+    env_file:
+      - ./daapd.env
 
   syncthing:
     container_name: syncthing

traefik/rules.toml

@@ -6,10 +6,22 @@
   [frontends.frontend-daapd.routes]
   [frontends.frontend-daapd.routes.route-daapd-ext]
   rule = "Host:daapd.2030davenport.com"
+  [frontends.frontend-daapd-ws]
+  entrypoints = ["ws"]
+  backend = "backend-daapd-ws"
+  passHostHeader = true
+  InsecureSkipVerify = true
+  [frontends.frontend-daapd-ws.routes.route-daapd-ext-ws]
+  rule = "Host:daapd.2030davenport.com"
 
 [backends]
   [backends.backend-daapd]
   [backends.backend-daapd.servers]
   [backends.backend-daapd.servers.server-daapd-ext]
   url = "http://192.168.1.50:3689"
   weight = 0
+  [backends.backend-daapd-ws]
+  [backends.backend-daapd-ws.servers]
+  [backends.backend-daapd-ws.servers.server-daapd-ext-ws]
+  url = "http://192.168.1.50:3687"
+  weight = 0

traefik/traefik.toml

@@ -9,6 +9,9 @@ defaultEntryPoints = ["https", "http"]
   address = ":80"
     [entryPoints.http.redirect]
     entryPoint = "https"
+  [entryPoints.ws]
+  address = ":3688"
+    [entryPoints.ws.tls]
 
 [acme]
 email = "tyler@tylerball.net"