Matthias Kleine 8 anos atrás
pai
commit
669029cc2b
4 arquivos alterados com 26 adições e 14 exclusões
  1. 17 9
      docker-compose.yml
  2. 7 2
      fhem/fhem.cfg
  3. 1 2
      homebridge/Dockerfile
  4. 1 1
      homebridge/config.json

+ 17 - 9
docker-compose.yml

@@ -19,16 +19,24 @@ services:
             - ./fhem/contrib/dblog/db.conf:/opt/fhem/contrib/dblog/db.conf
         networks:
             - code-network
+        depends_on:
+            - "mysql"
+
+    homebridge:
+        expose:
+            - "51826"
+            - "8282"
+        ports:
+            - "51826:51826"
+            - "8282:8282"
+        build: homebridge
+        volumes:
+            - ./homebridge/config.json:/root/.homebridge/config.json
+        networks:
+            - code-network
+        depends_on:
+            - "fhem"
 
-#    homebridge:
-#        expose:
-#            - "51826"
-#        ports:
-#            - "51826:51826"
-#        build: homebridge
-#        networks:
-#            - code-network
-#
     mysql:
         expose:
             - "3306"

+ 7 - 2
fhem/fhem.cfg

@@ -1,4 +1,4 @@
-attr global userattr DbLogExclude DbLogInclude cmdIcon devStateIcon devStateStyle icon sortby webCmd widgetOverride
+attr global userattr DbLogExclude DbLogInclude cmdIcon devStateIcon devStateStyle genericDeviceType:security,ignore,switch,outlet,light,blind,thermometer,thermostat,contact,garage,window,lock homebridgeMapping:textField-long icon sortby webCmd widgetOverride
 attr global autoload_undefined_devices 1
 attr global icon it_network
 attr global logfile ./log/fhem-%Y-%m.log
@@ -21,7 +21,7 @@ attr WEB icon it_i-net
 attr WEB menuEntries haus-automatisierung.com,https://haus-automatisierung.com/
 attr WEB plotWeekStartDay 1
 attr WEB room System
-attr WEB roomIcons Log:edit_paste System:it_network Save.config:message_attention Everything:it_i-net Unsorted:unknown Commandref:system_fhem Remote.doc:message_mail Edit.files:edit_copy Select.style:edit_open Event.monitor:edit_settings
+attr WEB roomIcons Homekit:audio_audio Log:edit_paste System:it_network Save.config:message_attention Everything:it_i-net Unsorted:unknown Commandref:system_fhem Remote.doc:message_mail Edit.files:edit_copy Select.style:edit_open Event.monitor:edit_settings
 attr WEB title FHEM Docker (haus-automatisierung.com)
 
 # Fake FileLog entry, to access the fhem log from FHEMWEB
@@ -44,3 +44,8 @@ attr DBLogging icon time_note
 attr DBLogging room Log
 define DBLogging_Reopen at +*00:15:00 set DBLogging reopen
 attr DBLogging_Reopen room Log
+define testSwitch dummy
+attr testSwitch genericDeviceType switch
+attr testSwitch room Homekit
+attr testSwitch setList on off
+attr testSwitch webCmd on:off

+ 1 - 2
homebridge/Dockerfile

@@ -23,5 +23,4 @@ RUN npm install -g homebridge homebridge-fhem homebridge-http
 EXPOSE 51826
 
 COPY start.sh ./
-RUN chmod +x ./start.sh
-CMD ["bash ./start.sh"]
+CMD bash ./start.sh

+ 1 - 1
homebridge/config.json

@@ -1,7 +1,7 @@
 {
   "bridge": {
     "name": "Homebridge FHEM",
-    "username": "CC:22:3D:E3:CE:29",
+    "username": "CC:22:3D:E3:CE:39",
     "port": 51826,
     "pin": "012-34-567"
   },