Several improvements

README.md

@@ -2,7 +2,7 @@
 
 ## Contains
 
-- FHEM + haus-automatisierung.com FHEM frontend style
+- FHEM + haus-automatisierung.com FHEM frontend style + Tablet UI + ABFALL Module
 - Apache 2 as a reverse proxy to FHEM
 - Homebridge + FHEM Homebridge
 - mySQL-Logging
@@ -23,9 +23,9 @@ docker-compose up
 ## Defaults
 
 - FHEM-WEB: 8083 (8084 and 8085 have been deleted)
-- mySQL-Root-Password: adgbciBOZjwYXeATg
 - mySQL-User: fhemuser
 - mySQL-Password: 2jRHnEi3WuNSQAcX7
+- Homekit-Pairing-Code: 012-34-567
 
 ## Updating FHEM
 

docker-compose.yml

@@ -13,10 +13,12 @@ services:
         devices:
           - "/dev/ttyUSB0:/dev/ttyUSB0"
         volumes:
+            - ./fhem/start.sh:/opt/fhem/start.sh
             - ./fhem/log/:/opt/fhem/log
-            - ./fhem/fhem.cfg:/opt/fhem/fhem.cfg
-            - ./fhem/FHEM/99_myUtils.pm:/opt/fhem/FHEM/99_myUtils.pm
-            - ./fhem/contrib/dblog/db.conf:/opt/fhem/contrib/dblog/db.conf
+            - ./fhem/data/fhem.cfg:/opt/fhem/fhem.cfg
+            - ./fhem/data/controls.txt:/opt/fhem/controls.txt
+            - ./fhem/data/FHEM/99_myUtils.pm:/opt/fhem/FHEM/99_myUtils.pm
+            - ./fhem/data/contrib/dblog/db.conf:/opt/fhem/contrib/dblog/db.conf
         networks:
             - code-network
         depends_on:
@@ -31,6 +33,7 @@ services:
             - "8282:8282"
         build: homebridge
         volumes:
+            - ./homebridge/start.sh:/root/start.sh
             - ./homebridge/config.json:/root/.homebridge/config.json
         networks:
             - code-network
@@ -49,7 +52,7 @@ services:
             - ./mysql/init.sql:/docker-entrypoint-initdb.d/fhem-init.sql
             - ./mysql/data:/var/lib/mysql
         environment:
-            - MYSQL_ROOT_PASSWORD=adgbciBOZjwYXeATg
+            - MYSQL_RANDOM_ROOT_PASSWORD=yes
         networks:
             - code-network
 

fhem/data/controls.txt

@@ -0,0 +1,3 @@
+http://fhem.de/fhemupdate/controls_fhem.txt
+https://raw.githubusercontent.com/uniqueck/fhem-abfall/master/controls_fhemabfall.txt
+https://raw.githubusercontent.com/knowthelist/fhem-tablet-ui/master/controls_fhemtabletui.txt

fhem/start.sh

@@ -1,7 +1,13 @@
 #!/bin/bash
 
+echo "Starte FHEM"
 sudo service fhem start
+
+echo "FHEM Update"
 perl fhem.pl 7072 "update all"
+
+echo "FHEM Neustart"
 perl fhem.pl 7072 "shutdown restart"
 
+echo "Alles fertig"
 tail -f /dev/null

homebridge/start.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+sleep 15s
+echo "Starte Homebridge nach Wartezeit für FHEM-Update..."
+
 /etc/init.d/dbus restart
 service avahi-daemon start
 homebridge