From 4dbc5051cc33bf36577106b6c1f55109e7862c2d Mon Sep 17 00:00:00 2001
From: Robert Schumann <rs@n-os.org>
Date: Sat, 3 Dec 2016 11:25:50 +0100
Subject: [PATCH] change default port and add settings.xml

---
 Dockerfile   |  9 ++++++---
 settings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 start.sh     |  2 +-
 3 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 settings.xml

diff --git a/Dockerfile b/Dockerfile
index 12ae29c..17f479c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,11 +5,13 @@ MAINTAINER Robert Schumann <gutmensch@n-os.org>
 ENV wget_opts "-q --no-check-certificate"
 ENV raumserver_release "http://bassmaniacs.com/data/appBinaries/raumserver/currentVersion"
 ENV raumserver_libs "https://github.com/ChriD/Raumserver/raw/master/source/RaumserverDaemon/libs/linux_X64"
+ENV raumserver_http "8090"
 ENV PATH /opt:$PATH
 
 WORKDIR /opt
 
 COPY start.sh ./start.sh
+COPY settings.xml ./settings.xml
 
 RUN set -x \
       && apt-get update \
@@ -20,14 +22,15 @@ RUN set -x \
       && wget $wget_opts $raumserver_release/raumserverDaemon_linux_X64.zip \
       && unzip raumserverDaemon_linux_X64.zip -d raumserver \
       && rm -f raumserverDaemon_linux_X64.zip \
-      && mkdir -p /etc/raumfeld/raumserverDaemon \
-      && ln -s /opt/raumserver/docroot /etc/raumfeld/raumserverDaemon/docroot \
+      && mv raumserver/settings.xml raumserver/settings.xml.dist \
+      && sed -i 's%RAUMSERVER_HTTP%$raumserver_http%' settings.xml \
+      && mv settings.xml raumserver/ \
       && for l in libunwind-x86_64.so.8.0.1 libunwind.so.8.0.1 libunwind-coredump.so.0.0.0 libunwind-setjmp.so.0.0.0 libunwind-ptrace.so.0.0.0; do \
            wget $wget_opts $raumserver_libs/"$l" -O /usr/lib/"$l" && \
            ln -s /usr/lib/"$l" /usr/lib/"$(echo $l | sed 's%\.[0-9]\.[0-9]$%%')" ; \
          done \
       && chmod +x start.sh
 
-EXPOSE 8080
+EXPOSE $raumserver_http
 
 CMD ["start.sh"]
diff --git a/settings.xml b/settings.xml
new file mode 100644
index 0000000..e1c72b9
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application>  
+  <Raumkernel>
+    <!-- Log settings. You might change some settings here if you want to change the output log level or add/remove a log adapter
+         To get the available options for 'LogLevel' and 'LogAdapter' please take a look at the documentation -->
+    <Log>
+      <Level>DEBUG</Level>
+      <LevelUpnp>ERROR</LevelUpnp>
+      <!--<LevelUpnp>ALL,ADAPTERCHANGE,BONJOUR,DEVICE,DVDEVICE,DVEVENT,DVWEBSOCKET,DVINVOCATION,DVSSDPNOTIFIER,ERROR,EVENT,HTTP,LPEC,NETWORK,NONE,SERVICE,SSDPMULTICAST,;SSDPUNICAST,TRACE,THREAD,TIMER,VERBOSE,XMLFETCH</LevelUpnp>-->
+    </Log>
+    
+    <!-- the kernel uses the first available networkadapter found in the system. This may not be the one you like to use! -->
+    <!-- so you can type in the network adapter name the application should use!-->
+    <NetworkAdapterName priority="1" waitForAppearance="250">eth0</NetworkAdapterName>
+    <NetworkAdapterName priority="2" waitForAppearance="250">wlan0</NetworkAdapterName>
+    <NetworkAdapterName priority="3" waitForAppearance="0">Killer Wireless-N 1202 Network Adapter</NetworkAdapterName>
+    
+    <!-- Enable/disable discovery of non raumfeld renderers -->
+    <AddNonRaumfeldDevices>0<AddNonRaumfeldDevices>
+
+      <!-- the time step in ms on which the kernel does refresh the device list to get abruplty removed UPNP devices (without announcing its removal) -->
+    <UPNPRefreshTimeActive>1</UPNPRefreshTimeActive>
+    <UPNPRefreshTime>30000</UPNPRefreshTime>
+
+    <!-- Some internal sleeping values -->
+    <HTTPRequestPumpSleep>20</HTTPRequestPumpSleep>
+    <HTTPRequestHandlerSleep>20</HTTPRequestHandlerSleep>
+
+    <!-- Some basic kernel setting for recognizing the RaumfeldUPNP devices and for requesting the host when using RAUMFELD system -->
+    <Raumfeld>
+      <HostConfigDeviceName>Raumfeld ConfigDevice</HostConfigDeviceName>
+      <MediaServerName>Raumfeld MediaServer</MediaServerName>
+      <HostRequestPort>47365</HostRequestPort>
+      <MediaRendererIdentification>MediaRenderer</MediaRendererIdentification>
+      <MediaServerIdentification>MediaServer</MediaServerIdentification>
+      <RaumfeldDescriptionVirtualMediaPlayer>Virtual Media Player</RaumfeldDescriptionVirtualMediaPlayer>
+      <RaumfeldManufacturer>Raumfeld GmbH</RaumfeldManufacturer>
+    </Raumfeld>
+    
+  </Raumkernel>
+  
+  <Raumserver>
+    <!-- port where the server listens to requests -->
+    <Port>RAUMSERVER_HTTP</Port>
+    <Docroot>/opt/raumserver/docroot</Docroot>
+  </Raumserver>
+  
+</Application>
diff --git a/start.sh b/start.sh
index 6fbba54..5db6cdf 100644
--- a/start.sh
+++ b/start.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-/opt/raumserver/raumsrvDaemon && sleep infinity
+/opt/raumserver/raumsrvDaemon && tail -f /opt/raumserver/log/*.log