Homematic v8.0 (#485)

* Update HomeMatic OCCU to version 3.41.11 (#482)

* Update HomeMatic OCCU to version 3.41.11

* Update CHANGELOG.md

* Update config.json

* Homematic OCCU: Fix write error when starting OCCU due to missing status directory. (#483)

HMIPServer writes a lock file to /var/status/HMServerStarted, so create directory /var/status to prevent an exception that may confuse users.

* Homematic OCCU: Supply custom log4j configuration for HMIPServer to log to console. (#484)

This allows reading the HMIPServer log via the docker log file.
The default configuration logs to file and syslog which is not accessible from outside the docker container.

* Update CHANGELOG.md

* Update CHANGELOG.md

homematic/CHANGELOG.md

@@ -1,26 +1,31 @@
 # Changelog
 
-## 7
+## 8.0
+- Update OCCU to 3.41.11
+- Fix write error when starting OCCU / HmIP
+- Redirect HMIPServer log to console
+
+## 7.0
 - Update OCCU to 3.41.7
 
-## 6
+## 6.0
 - Allow customer firmware updates inside `/share`
 - Update Hardware on startup
 - Limit HmIP server to 64mb memory
 - Set `rf_enable` default to `false`
 
-## 5
+## 5.0
 - Save hmip_address.conf persistent
 
-## 4
+## 4.0
 - New ubuntu base images
 - Support firmware update of HM-MOD-RPI-PCB, HmIP-RFUSB
 - Add HmIP support with HmIP-RFUSB
 
-## 3
+## 3.0
 - Add periodically time sync
 
-## 2
+## 2.0
 - Fix wrong Timezone
 - Update OCCU to 3.37.8
 

homematic/Dockerfile

@@ -20,6 +20,7 @@ RUN curl -SL https://github.com/eq-3/occu/archive/${OCCU_VERSION}.tar.gz | tar x
     && mkdir -p /opt/hm/etc/config \
     && mkdir -p /opt/HmIP \
     && mkdir -p /opt/HMServer \
+    && mkdir -p /var/status \
     && mkdir -p /boot \
     && echo "VERSION=${OCCU_VERSION}" > /boot/VERSION \
     && ln -s /opt/hm/etc/config /etc/config \
@@ -39,17 +40,16 @@ RUN curl -SL https://github.com/eq-3/occu/archive/${OCCU_VERSION}.tar.gz | tar x
     && cd ../ \
     && cp -r firmware / \
     && mv /firmware/HmIP-RFUSB/hmip_coprocessor_update.eq3 /firmware/HmIP-RFUSB/hmip_coprocessor_update-2.8.6.eq3 \
-    && cp -R HMserver/etc/config_templates/* /opt/hm/etc/config/ \
     && cp -R HMserver/opt/HmIP/* /opt/HmIP/ \
     && cp -a HMserver/opt/HMServer/HMIPServer.jar /opt/HMServer/ \
     && cp -R HMserver/opt/HMServer/groups /opt/HMServer/ \
-	&& cp -R HMserver/opt/HMServer/measurement /opt/HMServer/ \
+    && cp -R HMserver/opt/HMServer/measurement /opt/HMServer/ \
-	&& cp -R HMserver/opt/HMServer/pages /opt/HMServer/ \
+    && cp -R HMserver/opt/HMServer/pages /opt/HMServer/ \
     && rm -rf /usr/src/occu-${OCCU_VERSION}
 ENV HM_HOME=/opt/hm LD_LIBRARY_PATH=/opt/hm/lib:${LD_LIBRARY_PATH}
 
 # Update config files
-COPY rfd.conf hs485d.conf crRFD.conf /etc/config/
+COPY rfd.conf hs485d.conf crRFD.conf log4j.xml /etc/config/
 
 # Setup start script
 COPY run.sh /

homematic/build.json

@@ -5,6 +5,6 @@
     "i386": "homeassistant/i386-base-ubuntu:18.04"
   },
   "args": {
-    "OCCU_VERSION": "3.41.7"
+    "OCCU_VERSION": "3.41.11"
   }
 }

homematic/config.json

@@ -1,6 +1,6 @@
 {
   "name": "HomeMatic OCCU",
-  "version": "7",
+  "version": "8.0",
   "slug": "homematic",
   "description": "HomeMatic central based on OCCU",
   "url": "https://home-assistant.io/addons/homematic/",

homematic/log4j.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d [%p] %c{1} - %m%n" />
+		</layout>
+	</appender>
+
+	<category name="de.eq3">
+		<priority value="INFO" />
+	</category>
+	<category name="org">
+		<priority value="INFO" />
+	</category>
+	<category name="com">
+		<priority value="INFO" />
+	</category>
+
+	<root>
+		<priority value="ERROR" />
+		<appender-ref ref="CONSOLE" />
+	</root>
+
+</log4j:configuration>