From 18783562a7df61f871d7f1500702f4a6431a1a78 Mon Sep 17 00:00:00 2001
From: Simon Milvert <simon@milvert.com>
Date: Fri, 16 Oct 2020 21:50:02 +0200
Subject: [PATCH] Working

---
 .env                           |  2 +-
 docker-compose.yml             | 13 ++++---------
 zigbee2mqtt/configuration.yaml | 31 +++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index e8263a7..cebe55d 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
 UID=1000
 GID=1000
 DIR=/srv/docker
-DOMAIN=milvert.com
+DOMAIN=localhost
 
 
 MYSQL_USERNAME=root
diff --git a/docker-compose.yml b/docker-compose.yml
index c83b6ff..495c0c9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,20 +1,19 @@
 version: '3'
 
 services:
+
   zigbee2mqtt:
     container_name: zigbee2mqtt
     networks:
       - backend
     image: koenkk/zigbee2mqtt
     volumes:
-      - ${DIR}/zigbee2matt:/app/data
-      - ${DIR}/zigbee2mqtt_node_log:/root/.npm
+      - ${DIR}/zigbee2mqtt:/app/data
+      - ./zigbee2mqtt/configuration.yaml:/app/data/configuration.yaml
     devices:
       - /dev/ttyUSB0:/dev/ttyACM0
     restart: always
     environment:
-      - UID=1000
-      - GID=1000
       - TZ=Europe/Stockholm
 
   mqtt:
@@ -27,14 +26,11 @@ services:
     ports:
       - "1883:1883"
       - "9001:9001"
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Stockholm
     volumes:
       - ./mosquitto/mosquitto.conf:/mqtt/mosquitto.conf
       - ${DIR}/mqtt/data:/mqtt/data
       - ${DIR}/mqtt/log:/mqtt/log
+
     labels:
       - "traefik.http.routers.mqtt.rule=Host(`mqtt.${DOMAIN}`)"
       - "traefik.http.routers.mqtt.entrypoints=mqtt"
@@ -63,7 +59,6 @@ services:
       - "traefik.http.routers.node-red-secure.entrypoints=web-secure"
       - "traefik.http.routers.node-red-secure.rule=Host(`nodered.${DOMAIN}`)"
       - "traefik.http.routers.node-red-secure.tls.certresolver=milvert"
-      - "traefik.http.routers.node-red-secure.tls=true"
       - "traefik.enable=true"
 
 
diff --git a/zigbee2mqtt/configuration.yaml b/zigbee2mqtt/configuration.yaml
index 458d7ca..0a0c53d 100644
--- a/zigbee2mqtt/configuration.yaml
+++ b/zigbee2mqtt/configuration.yaml
@@ -5,5 +5,36 @@ mqtt:
   server: 'mqtt://mqtt:1883'
 advanced:
   log_level: debug
+  pan_id: 6753
+  network_key:
+    - 252
+    - 196
+    - 168
+    - 85
+    - 198
+    - 30
+    - 142
+    - 172
+    - 136
+    - 40
+    - 227
+    - 175
+    - 77
+    - 84
+    - 231
+    - 215
 serial:
   port: /dev/ttyACM0
+devices:
+  '0xccccccfffe4c4499':
+    friendly_name: remote - ute
+  '0xccccccfffe2e196c':
+    friendly_name: Ute - Ministuga
+  '0xccccccfffe2c6653':
+    friendly_name: Ute - Hörn
+  '0x680ae2fffed1de68':
+    friendly_name: Ute - veranda
+  '0x680ae2fffefc0ed4':
+    friendly_name: 'Ute - Björk 1'
+  '0x588e81fffe3eb906':
+    friendly_name: 'Ute - Björk 2'