Refactor docker to docker-compose.{service}.yml

2020-11-21 20:37:01 +01:00 · 2020-11-21 20:37:01 +01:00 · 80478ff9cd
parent fa4ffac2cb
commit 80478ff9cd
31 changed files with 490 additions and 393 deletions
--- a/.env
+++ b/.env
@ -2,16 +2,21 @@ UID=1000
 GID=1000
 DIR=/srv/docker
 DOMAIN=milvert.com
+DOMAIN_PEEK=peekskog.se


 MYSQL_USERNAME=root
 MYSQL_PASSWORD=qwerty
+MYSQL_ROOT_PASSWORD=bajsa

 POSTGRES_USER=root
 POSTGRES_PASSWORD=qwerty
 PGADMIN_DEFAULT_EMAIL=kalle@asd.com
 PGADMIN_DEFAULT_PASSWORD=bajsa

-PUID=1000
+INFLUX_ADMIN=simon
+INFLUX_ADMIN_PASSWORD=bajsa123
+
+jUID=1000
 PGID=1000
 TZ=Europe/Stockholm
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
+[submodule "diabets_app"]
+	path = diabets_app
+	url = git@milvert.com:simon/diabets_app.git
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 75ba28f3afa2b0c4baab06823411f02e1dea5f20
--- a/docker-compose.database.yml
+++ b/docker-compose.database.yml
@ -0,0 +1,61 @@
+
+version: '3'
+
+services:
+  db:
+    image: mariadb:10.5.6
+    container_name: mariaDB
+    restart: always
+    environment:
+      - PUID=1000
+      - PGID=1000
+    networks:
+      - backend
+      - frontend
+    volumes:
+      - ${DIR}/database:/var/lib/mysql:rw
+    ports:
+      - "3307:3306"
+    labels:
+      - "traefik.enable=false"
+    environment:
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_USER=${MYSQL_USERNAME}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+
+  web_db:
+    image: adminer
+    container_name: adminer
+    restart: always
+    networks:
+      - frontend
+      - backend
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.middlewares.webdb-mid.ipwhitelist.sourcerange=127.0.0.1/32, 10.0.0.1/24"
+      - "traefik.http.routers.webdb-secure.middlewares=webdb-mid"
+      - "traefik.http.routers.webdb-secure.entrypoints=web-secure"
+      - "traefik.http.routers.webdb-secure.rule=Host(`webdb.${DOMAIN}`)"
+      - "traefik.http.routers.webdb-secure.tls.certresolver=milvert"
+      - "traefik.http.routers.webdb-secure.tls=true"
+      - "traefik.http.services.webdb-service.loadbalancer.server.port=8080"
+    depends_on:
+      - db
+    environment:
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_USER=${MYSQL_USERNAME}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - PMA_ARBITRARY=1
+    depends_on:
+      - db
+
+    ports:
+      - 8000:8080
+
+
+networks:
+  frontend:
+    external: true
+  backend:
+    external: false
+
--- a/docker-compose.home.yml
+++ b/docker-compose.home.yml
@ -0,0 +1,35 @@
+
+version: '3'
+
+services:
+  node-red:
+    image: nodered/node-red:1.2.2
+    container_name: "node-red"
+    networks:
+      - backend
+    environment:
+      - TZ=Europe/Stockholm
+    ports:
+      - "1881:1880"
+    #devices:
+        #- /dev/ttyAMA0
+    restart: unless-stopped
+    user: ${UID}
+    volumes:
+      - ${DIR}/nodered:/data
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.services.node-red-service.loadbalancer.server.port=1880"
+      - "traefik.http.routers.node-red.rule=Host(`nodered.${DOMAIN}`)"
+      - "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"
+
+
+networks:
+  frontend:
+    external: true
+  backend:
+    external: false
+
--- a/docker-compose.nextclouod.yml
+++ b/docker-compose.nextclouod.yml
@ -0,0 +1,27 @@
+version: '3'
+
+services:
+
+  nextcloud:
+    image: linuxserver/nextcloud
+    container_name: nextcloud
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=${TZ}
+    volumes:
+      - ${DIR}/nextcloud/config:/config
+      - /srv/owncloud:/data
+    networks:
+      - backend
+      - frontend
+    ports:
+      - 4430:443
+    restart: unless-stopped
+
+networks:
+  frontend:
+    external: true
+  backend:
+    external: false
+
--- a/docker-compose.per.yml
+++ b/docker-compose.per.yml
@ -0,0 +1,61 @@
+version: '3'
+
+services:
+  wordpress:
+    container_name: peek
+    depends_on:
+      - db_peek
+    image: wordpress:5.5.3-apache
+    volumes:
+      - /srv/docker/peekskog/wp:/var/www/html
+    ports:
+      - "8001:80"
+    networks:
+      - frontend
+      - backend
+    restart: always
+    environment:
+      WORDPRESS_DB_HOST: db_peek:3306
+      WORDPRESS_DB_USER: wordpress
+      WORDPRESS_DB_PASSWORD: peekskog
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.peek-secure.entrypoints=web-secure"
+      - "traefik.http.routers.peek-secure.rule=Host(`${DOMAIN_PEEK}`)"
+      - "traefik.http.routers.peek-secure.tls.certresolver=milvert"
+      - "traefik.http.routers.peek-secure.tls=true"
+
+  db_peek:
+    container_name: db_peek
+    image: mysql:5.7
+    volumes:
+      - /srv/docker/peekskog/db:/var/lib/mysql
+    restart: always
+    networks:
+      - frontend
+      - backend
+    environment:
+      MYSQL_ROOT_PASSWORD: peekskog
+      MYSQL_DATABASE: wordpress
+      MYSQL_USER: wordpress
+      MYSQL_PASSWORD: peekskog
+
+  phpmyadmin_peek:
+    depends_on:
+      - db_peek
+    image: phpmyadmin/phpmyadmin
+    container_name: phpmyadmin_peek
+    restart: always
+    networks:
+      - backend
+    ports:
+      - '8007:80'
+    environment:
+      PMA_HOST: db_peek
+
+networks:
+  frontend:
+    external: true
+  backend:
+    external: false
+
--- a/docker-compose.service.yml
+++ b/docker-compose.service.yml
@ -0,0 +1,146 @@
+version: '3'
+
+services:
+
+  zigbee_home_2:
+    container_name: zigbee_home_2
+    networks:
+      - backend
+    image: koenkk/zigbee2mqtt:1.15.0
+    volumes:
+      - ./zigbee_home_2:/app/data
+      - ./zigbee_home_2/configuration_home_2.yaml:/app/data/configuration.yaml
+    devices:
+      - /dev/ttyUSB-zigbee_home_2:/dev/ttyACM0
+    environment:
+      - UID=1000
+      - GID=1000
+      - TZ=Europe/Stockholm
+
+  zigbee2mqtt:
+    container_name: zigbee2mqtt
+    networks:
+      - backend
+    image: koenkk/zigbee2mqtt:1.15.0
+    volumes:
+      - ${DIR}/zigbee2matt:/app/data
+      - ${DIR}/zigbee2mqtt_node_log:/root/.npm
+    devices:
+      - /dev/ttyACM1:/dev/ttyACM0
+    environment:
+      - UID=1000
+      - GID=1000
+      - TZ=Europe/Stockholm
+
+  grafana:
+    image: grafana/grafana:7.3.1
+    container_name: grafana
+    networks:
+      - backend
+    volumes:
+      # Data persistency
+      # sudo mkdir -p /srv/docker/grafana/data; chown 472:472 /srv/docker/grafana/data
+      - "${DIR}/grafana:/var/lib/grafana"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.grafana-secure.entrypoints=web-secure"
+      - "traefik.http.routers.grafana-secure.rule=Host(`data.${DOMAIN}`)"
+      - "traefik.http.routers.grafana-secure.tls.certresolver=milvert"
+      - "traefik.http.routers.grafana-secure.tls=true"
+
+  influx:
+    image: influxdb:1.8
+    container_name: influxdb
+    networks:
+      - backend
+    restart: always
+    volumes:
+      - ${DIR}/influx-data:/var/lib/influxdb
+    environment:
+      - INFLUXDB_DB=db0
+      - INFLUXDB_ADMIN_USER=${INFLUX_ADMIN}
+      - INFLUXDB_ADMIN_PASSWORD=${INFLUX_ADMIN_PASSWORD}
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.services.influx-service.loadBalancer.server.port=8086"
+      - "traefik.http.routers.influx.entryPoints=influx"
+      - "traefik.http.routers.influx-secure.rule=host(`influx.${DOMAIN}`)"
+
+  chronograf:
+    image: chronograf:latest
+    container_name: chronograf
+    networks:
+      - backend
+    volumes:
+      - ${DIR}/chronograf:/var/lib/chronograf
+    depends_on:
+      - influx
+    environment:
+      - INFLUXDB_URL=http://influxdb:8086
+      - INFLUXDB_USERNAME=${INFLUX_ADMIN}
+      - INFLUXDB_PASSWORD=${INFLUX_ADMIN_PASSWORD}
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.services.chrongraf-service.loadBalancer.server.port=8888"
+      - "traefik.http.routers.chrongraf-secure.entryPoints=web-secure"
+      - "traefik.http.routers.chrongraf-secure.rule=host(`chrono.${DOMAIN}`)"
+      - "traefik.http.routers.chrongraf-secure.tls.certresolver=milvert"
+      - "traefik.http.routers.chrongraf-secure.tls=true"
+
+  gitea:
+    image: gitea/gitea:1.12
+    container_name: gitea
+    networks:
+      - backend
+    restart: always
+    environment:
+      - USER_UID=1001
+      - USER_GID=1005
+    volumes:
+      #- /var/lib/gitea:/data
+      - ${DIR}/gitea:/data
+      - /home/git/.ssh:/data/git/.ssh
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "127.0.0.1:2222:22"
+      - "3000:3000"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.services.gitea-service.loadbalancer.server.port=3000"
+      - "traefik.http.routers.gitea-secure.entrypoints=web-secure"
+      - "traefik.http.routers.gitea-secure.rule=Host(`gitea.${DOMAIN}`)"
+      - "traefik.http.routers.gitea-secure.tls.certresolver=milvert"
+      - "traefik.http.routers.gitea-secure.tls=true"
+
+
+  mqtt:
+    image: eclipse-mosquitto:1.6.10
+    container_name: mqtt
+    networks:
+      - frontend
+      - backend
+    restart: always
+    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"
+      - "traefik.http.services.mqtt-service.loadbalancer.server.port=9001"
+      - "traefik.enable=true"
+
+networks:
+  frontend:
+    external: true
+  backend:
+    external: false
+
--- a/docker-compose.web.yml
+++ b/docker-compose.web.yml
@ -0,0 +1,90 @@
+version: '3'
+
+services:
+  milvert:
+    container_name: milvert
+    image: nginx:latest
+    restart: always
+    networks:
+      - backend
+      - frontend
+    ports:
+      - 8004:80
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.milvert.com-secure.entrypoints=web-secure"
+      - "traefik.http.routers.milvert.com-secure.rule=Host(`${DOMAIN}`)"
+      - "traefik.http.routers.milvert.com-secure.tls.certresolver=milvert"
+      - "traefik.http.routers.milvert.com-secure.tls=true"
+      #- "traefik.http.routers.milvert-secure.priority=1"
+    volumes:
+      - "${DIR}/milvert-nginx/conf:/etc/nginx/conf.d"
+      - "${DIR}/milvert-nginx/html:/html"
+
+  whoami:
+    # A container that exposes an API to show its IP address
+    container_name: whoami
+    image: containous/whoami
+    networks:
+      - backend
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.whoami-secure.entrypoints=web-secure"
+      - "traefik.http.routers.whoami-secure.rule=Host(`whoami.${DOMAIN}`)"
+      - "traefik.http.routers.whoami-secure.tls.certresolver=milvert"
+      - "traefik.http.routers.whoami-secure.tls=true"
+
+  diak:
+    image: diak:1.0
+    build: ./diabets_app/client
+    container_name: diak
+    networks:
+      - backend
+      - frontend
+    ports:
+      - 8003:80
+        #devices:
+        #- path to device:path to device
+    restart: unless-stopped
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.diak-secure.entrypoints=web-secure"
+      - "traefik.http.routers.diak-secure.rule=Host(`diak.${DOMAIN}`)"
+      - "traefik.http.routers.diak-secure.tls.certresolver=milvert"
+      - "traefik.http.routers.diak-secure.tls=true"
+
+
+
+  syncthing:
+    image: linuxserver/syncthing
+    container_name: syncthing
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Stockholm
+      - UMASK_SET=022
+    volumes:
+      - /mnt/johanna_backup/syncthing/config:/config
+      - /mnt/johanna_backup/data1:/data1
+      - /mnt/johanna_backup/data2:/data2
+    ports:
+      - 8384:8384
+      - 22000:22000
+      - 21027:21027/udp
+    networks:
+      - frontend
+      - backend
+    restart: unless-stopped
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.sync_johanna-secure.entrypoints=web-secure"
+      - "traefik.http.routers.sync_johanna-secure.rule=Host(`sync.${DOMAIN}`)"
+      - "traefik.http.routers.sync_johanna-secure.tls.certresolver=milvert"
+      - "traefik.http.routers.sync_johanna-secure.tls=true"
+
+networks:
+  frontend:
+    external: true
+  backend:
+    external: false
+
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,213 +1,11 @@
 version: '3'

 services:
-  syncthing:
-    image: linuxserver/syncthing
-    container_name: syncthing
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Stockholm
-      - UMASK_SET=022
-    volumes:
-      - ./syncthing/config:/config
-      - /mnt/johanna_backup:/data1
-    ports:
-      - 8384:8384
-      - 22000:22000
-      - 21027:21027/udp
-    networks:
-      - frontend
-      - backend
-    restart: unless-stopped
-
-  milvert-nginx:
-    container_name: milvert-nginx
-    image: nginx:latest
-    restart: always
-    networks:
-      - backend
-    labels:
-      - "traefik.enable=true"
-
-        #HTTPS
-      - "traefik.http.routers.milvert-secure.entrypoints=web-secure"
-      - "traefik.http.routers.milvert-secure.rule=Host(`www.${DOMAIN}`, `${DOMAIN}`)"
-      - "traefik.http.routers.milvert-secure.priority=1"
-        # SSL
-      - "traefik.http.routers.milvert-secure.tls.certresolver=milvert"
-      - "traefik.http.routers.milvert-secure.tls=true"
-    volumes:
-      - "${DIR}/milvert-nginx/conf:/etc/nginx/conf.d"
-      - "${DIR}/milvert-nginx/html:/html"
-
-
-
-  zigbee2mqtt:
-    container_name: zigbee2mqtt
-    networks:
-      - backend
-    image: koenkk/zigbee2mqtt:1.13.0
-    volumes:
-      - ${DIR}/zigbee2matt:/app/data
-      - ${DIR}/zigbee2mqtt_node_log:/root/.npm
-    devices:
-      - /dev/ttyACM1:/dev/ttyACM0
-    environment:
-      - UID=1000
-      - GID=1000
-      - TZ=Europe/Stockholm
-
-  grafana:
-    image: grafana/grafana:6.4.2
-    container_name: grafana
-    networks:
-      - backend
-    volumes:
-      # Data persistency
-      # sudo mkdir -p /srv/docker/grafana/data; chown 472:472 /srv/docker/grafana/data
-      - "${DIR}/grafana:/var/lib/grafana"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.grafana.rule=Host(`grafana.${DOMAIN}`)"
-      - "traefik.http.routers.grafana.entrypoints=web"
-      - "traefik.http.services.grafana-service.loadbalancer.server.port=3000"
-
-  influx:
-    image: influxdb:1.7
-    container_name: influxdb
-    networks:
-      - backend
-    labels:
-      - "traefik.http.routers.influx.entryPoints=port8086"
-      - "traefik.http.routers.influx.rule=host(`influx.${DOMAIN}`)"
-      - "traefik.http.services.influx-service.loadBalancer.server.port=8086"
-    restart: always
-    volumes:
-      - ${DIR}/influx-data:/var/lib/influxdb
-    environment:
-      - INFLUXDB_DB=SOME_DB_NAME # set any other to create database on initialization
-      - INFLUXDB_HTTP_ENABLED=true
-      - INFLUXDB_HTTP_AUTH_ENABLED=true
-
-      - INFLUXDB_ADMIN_USER=SECURE_USERNAME
-      - INFLUXDB_ADMIN_PASSWORD=SECURE_PASS
-
-  gitea:
-    image: gitea/gitea:1.12
-    container_name: gitea
-    networks:
-      - backend
-    restart: always
-    environment:
-      - USER_UID=1001
-      - USER_GID=1005
-    volumes:
-      #- /var/lib/gitea:/data
-      - ${DIR}/gitea:/data
-      - /home/git/.ssh:/data/git/.ssh
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    ports:
-      - "127.0.0.1:2222:22"
-      - "3000:3000"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.gitea-service.loadbalancer.server.port=3000"
-      - "traefik.http.routers.gitea-secure.entrypoints=web-secure"
-      - "traefik.http.routers.gitea-secure.rule=Host(`gitea.${DOMAIN}`)"
-      - "traefik.http.routers.gitea-secure.tls.certresolver=milvert"
-      - "traefik.http.routers.gitea-secure.tls=true"
-
-  whoami:
-    # A container that exposes an API to show its IP address
-    container_name: whoami
-    image: containous/whoami
-    networks:
-      - backend
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.whoami-secure.entrypoints=web-secure"
-      - "traefik.http.routers.whoami-secure.rule=Host(`whoami.${DOMAIN}`)"
-      - "traefik.http.routers.whoami-secure.tls.certresolver=milvert"
-      - "traefik.http.routers.whoami-secure.tls=true"
-
-  mqtt:
-    image: eclipse-mosquitto:1.6.10
-    container_name: mqtt
-    networks:
-      - frontend
-      - backend
-    restart: always
-    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"
-      - "traefik.http.services.mqtt-service.loadbalancer.server.port=9001"
-      - "traefik.enable=true"
-
-  node-red:
-    image: nodered/node-red:latest
-    container_name: "node-red"
-    networks:
-      - backend
-    environment:
-      - TZ=Europe/Stockholm
-    ports:
-      - "1881:1880"
-    #devices:
-        #- /dev/ttyAMA0
-    restart: unless-stopped
-    user: ${UID}
-    volumes:
-      - ${DIR}/nodered:/data
-    labels:
-      - "traefik.http.routers.node-red.rule=Host(`nodered.${DOMAIN}`)"
-      - "traefik.http.routers.node-red.entrypoints=web"
-      - "traefik.http.services.node-red-service.loadbalancer.server.port=1880"
-      - "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"
-
-  domoticz:
-    image: linuxserver/domoticz
-    container_name: domoticz
-    networks:
-      - backend
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Stockholm
-        #- WEBROOT=domoticz #optional
-    volumes:
-      - ${DIR}/domoticz:/config
-    ports:
-      - 8081:8080
-        #devices:
-        #- path to device:path to device
-    restart: unless-stopped
-    labels:
-      - "traefik.http.routers.domo.rule=Host(`domo.${DOMAIN}`)"
-      - "traefik.http.routers.domo.entrypoints=web"
-      - "traefik.http.services.domo-service.loadbalancer.server.port=8080"
-      - "traefik.enable=true"


  reverse-proxy:
    # The official v2.0 Traefik docker image
-    image: traefik:v2.1
+    image: traefik:v2.3
    container_name: "traefik"
    networks:
      - backend
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@ -6,16 +6,17 @@ services:
    image: linuxserver/nextcloud
    container_name: nextcloud
    environment:
-      - PUID=1000
-      - PGID=1000
+      - PUID=33
+      - PGID=33
      - TZ=${TZ}
    volumes:
      - ${DIR}/nextcloud/config:/config
-      - ${DIR}/data:/data
+      - /srv/owncloud:/data
    networks:
      - backend
+      - frontend
    ports:
-      - 443:443
+      - 4430:443
    restart: unless-stopped

 networks:
--- a/static_config.yml
+++ b/static_config.yml
@ -32,6 +32,14 @@ http:
      tls:
       certResolver: milvert

+    redirecttohttps:
+      rule: "HostRegexp(`{host:.+}`)"
+      middlewares:
+        - httpsredirect
+      service: noop
+      entryPoints:
+         - web
+      priority: 1

  services:
    lampa-service:
@ -44,9 +52,18 @@ http:
        servers:
          - url: "http://10.0.0.3:5178"

+    noop:
+      loadBalancer:
+        servers:
+          - url: "http://localhost"
+
+
  middlewares:
    redirect:
      redirectScheme:
        permanent: true
        scheme: https
+    httpsredirect:
+      redirectScheme:
+        scheme: https

--- a/syncthing/config/cert.pem
+++ b/syncthing/config/cert.pem
@ -1,11 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIBmzCCASCgAwIBAgIIZwfh5D2Qk8cwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ
-c3luY3RoaW5nMB4XDTIwMDYzMDAwMDAwMFoXDTQwMDYyNTAwMDAwMFowFDESMBAG
-A1UEAxMJc3luY3RoaW5nMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE+mCO/n2FIq4q
-wUv2zNo2pZfjCtYRoRLpCFHyV213vcdGgM7s80fHRI3mhfa88JjhmfFS2iDSPfWi
-7/B3FSqZXuFZEw3xlH4e+T48mzsTYfs3gFwC1hVVPeypuZCL128Toz8wPTAOBgNV
-HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
-EwEB/wQCMAAwCgYIKoZIzj0EAwIDaQAwZgIxANBE+eHniXGRlaxdTmi0lYgPal5C
-CcM8EtugjyvFtbHLlMX37Mp/Ti+ab7iM0ttoeAIxAMs8X2yfIuBlRYz04z/X0PKD
-EWVksNGoOcu5VigMmzAESWVYh0WbyM53ZfgzBeVAPg==
-----END CERTIFICATE-----
--- a/syncthing/config/config.xml
+++ b/syncthing/config/config.xml
@ -1,86 +0,0 @@
-<configuration version="30">
-    <folder id="default" label="Default Folder" path="/config/Sync" type="sendreceive" rescanIntervalS="3600" fsWatcherEnabled="true" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
-        <filesystemType>basic</filesystemType>
-        <device id="LCLVHOG-GNMFY3Q-LLH6WHN-N4DZ6EU-LSBMYB3-XNOB7TX-PZYCDQJ-SARUSAU" introducedBy=""></device>
-        <minDiskFree unit="%">1</minDiskFree>
-        <versioning></versioning>
-        <copiers>0</copiers>
-        <pullerMaxPendingKiB>0</pullerMaxPendingKiB>
-        <hashers>0</hashers>
-        <order>random</order>
-        <ignoreDelete>false</ignoreDelete>
-        <scanProgressIntervalS>0</scanProgressIntervalS>
-        <pullerPauseS>0</pullerPauseS>
-        <maxConflicts>-1</maxConflicts>
-        <disableSparseFiles>false</disableSparseFiles>
-        <disableTempIndexes>false</disableTempIndexes>
-        <paused>false</paused>
-        <weakHashThresholdPct>25</weakHashThresholdPct>
-        <markerName>.stfolder</markerName>
-        <copyOwnershipFromParent>false</copyOwnershipFromParent>
-        <modTimeWindowS>0</modTimeWindowS>
-        <maxConcurrentWrites>2</maxConcurrentWrites>
-        <disableFsync>false</disableFsync>
-        <blockPullOrder>standard</blockPullOrder>
-    </folder>
-    <device id="LCLVHOG-GNMFY3Q-LLH6WHN-N4DZ6EU-LSBMYB3-XNOB7TX-PZYCDQJ-SARUSAU" name="9bee8b2bc881" compression="metadata" introducer="false" skipIntroductionRemovals="false" introducedBy="">
-        <address>dynamic</address>
-        <paused>false</paused>
-        <autoAcceptFolders>false</autoAcceptFolders>
-        <maxSendKbps>0</maxSendKbps>
-        <maxRecvKbps>0</maxRecvKbps>
-        <maxRequestKiB>0</maxRequestKiB>
-    </device>
-    <gui enabled="true" tls="false" debugging="false">
-        <address>127.0.0.1:8384</address>
-        <apikey>vxYF9jYeAWW36MaCbbobgCeVGzy5euiY</apikey>
-        <theme>default</theme>
-    </gui>
-    <ldap></ldap>
-    <options>
-        <listenAddress>default</listenAddress>
-        <globalAnnounceServer>default</globalAnnounceServer>
-        <globalAnnounceEnabled>true</globalAnnounceEnabled>
-        <localAnnounceEnabled>true</localAnnounceEnabled>
-        <localAnnouncePort>21027</localAnnouncePort>
-        <localAnnounceMCAddr>[ff12::8384]:21027</localAnnounceMCAddr>
-        <maxSendKbps>0</maxSendKbps>
-        <maxRecvKbps>0</maxRecvKbps>
-        <reconnectionIntervalS>60</reconnectionIntervalS>
-        <relaysEnabled>true</relaysEnabled>
-        <relayReconnectIntervalM>10</relayReconnectIntervalM>
-        <startBrowser>true</startBrowser>
-        <natEnabled>true</natEnabled>
-        <natLeaseMinutes>60</natLeaseMinutes>
-        <natRenewalMinutes>30</natRenewalMinutes>
-        <natTimeoutSeconds>10</natTimeoutSeconds>
-        <urAccepted>-1</urAccepted>
-        <urSeen>3</urSeen>
-        <urUniqueID></urUniqueID>
-        <urURL>https://data.syncthing.net/newdata</urURL>
-        <urPostInsecurely>false</urPostInsecurely>
-        <urInitialDelayS>1800</urInitialDelayS>
-        <restartOnWakeup>true</restartOnWakeup>
-        <autoUpgradeIntervalH>12</autoUpgradeIntervalH>
-        <upgradeToPreReleases>false</upgradeToPreReleases>
-        <keepTemporariesH>24</keepTemporariesH>
-        <cacheIgnoredFiles>false</cacheIgnoredFiles>
-        <progressUpdateIntervalS>5</progressUpdateIntervalS>
-        <limitBandwidthInLan>false</limitBandwidthInLan>
-        <minHomeDiskFree unit="%">1</minHomeDiskFree>
-        <releasesURL>https://upgrades.syncthing.net/meta.json</releasesURL>
-        <overwriteRemoteDeviceNamesOnConnect>false</overwriteRemoteDeviceNamesOnConnect>
-        <tempIndexMinBlocks>10</tempIndexMinBlocks>
-        <trafficClass>0</trafficClass>
-        <defaultFolderPath>~</defaultFolderPath>
-        <setLowPriority>true</setLowPriority>
-        <maxFolderConcurrency>0</maxFolderConcurrency>
-        <crashReportingURL>https://crash.syncthing.net/newcrash</crashReportingURL>
-        <crashReportingEnabled>true</crashReportingEnabled>
-        <stunKeepaliveStartS>180</stunKeepaliveStartS>
-        <stunKeepaliveMinS>20</stunKeepaliveMinS>
-        <stunServer>default</stunServer>
-        <databaseTuning>auto</databaseTuning>
-        <maxConcurrentIncomingRequestKiB>0</maxConcurrentIncomingRequestKiB>
-    </options>
-</configuration>
--- a/syncthing/config/csrftokens.txt
+++ b/syncthing/config/csrftokens.txt
@ -1,4 +0,0 @@
-WsxEs7QECkQJyNh6z9AcKFNFVXWdg4xN
-Y55VA6zA74RmJfmdkebhXKCMYiUh2bhb
-mnkA97ovEvhSkcKXoDirtjVhwUAsc5iC
-Y55VA6zA74RmJfmdkebhXKCMYiUh2bhb
--- a/syncthing/config/https-cert.pem
+++ b/syncthing/config/https-cert.pem
@ -1,11 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIBoDCCASagAwIBAgIIWX3HVi6JAikwCgYIKoZIzj0EAwIwFzEVMBMGA1UEAxMM
-OWJlZThiMmJjODgxMB4XDTIwMDYzMDAwMDAwMFoXDTIyMDkyODAwMDAwMFowFzEV
-MBMGA1UEAxMMOWJlZThiMmJjODgxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEBTfW
-blOAa5FSqb/pwzMNDdrSIhX6HjoYIgm7IV/xf1o5TL0+PF6CTFBxL3sHpwAsx3xD
-PbSGMpX0eLjCAlGkmGoZanYyUb0d91lmDY1jH7hXplaj494y8GoEcwKCvcmJoz8w
-PTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MAwGA1UdEwEB/wQCMAAwCgYIKoZIzj0EAwIDaAAwZQIxAOLNbfE5awUQwKftZ75n
-upNDGLeWxWgNHti6G2+nlaLeJJZlIwL5kC82dDuuV2HH4wIwIlfnthBwxrFGNN9q
-/Dexa6Ahnz44wgNHY+MjHkfg8sd7NVHrjo7VXnSUQuuZHzKo
-----END CERTIFICATE-----
--- a/syncthing/config/https-key.pem
+++ b/syncthing/config/https-key.pem
@ -1,6 +0,0 @@
-----BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDAiY/SHClITBPOcQtItkOwJbPYlwHy/+dHNsZ5MnD1DXZs7NqIOWW6n
-zY+/Pvi0sUugBwYFK4EEACKhZANiAAQFN9ZuU4BrkVKpv+nDMw0N2tIiFfoeOhgi
-CbshX/F/WjlMvT48XoJMUHEvewenACzHfEM9tIYylfR4uMICUaSYahlqdjJRvR33
-WWYNjWMfuFemVqPj3jLwagRzAoK9yYk=
-----END EC PRIVATE KEY-----
--- a/syncthing/config/index-v0.14.0.db/000007.ldb
+++ b/syncthing/config/index-v0.14.0.db/000007.ldb
--- a/syncthing/config/index-v0.14.0.db/000008.ldb
+++ b/syncthing/config/index-v0.14.0.db/000008.ldb
--- a/syncthing/config/index-v0.14.0.db/000009.log
+++ b/syncthing/config/index-v0.14.0.db/000009.log
--- a/syncthing/config/index-v0.14.0.db/CURRENT
+++ b/syncthing/config/index-v0.14.0.db/CURRENT
@ -1 +0,0 @@
-MANIFEST-000010
--- a/syncthing/config/index-v0.14.0.db/CURRENT.bak
+++ b/syncthing/config/index-v0.14.0.db/CURRENT.bak
@ -1 +0,0 @@
-MANIFEST-000000
--- a/syncthing/config/index-v0.14.0.db/LOG
+++ b/syncthing/config/index-v0.14.0.db/LOG
@ -1,41 +0,0 @@
-=============== Jun 30, 2020 (CEST) ===============
-19:17:45.425828 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
-19:17:45.439384 db@open opening
-19:17:45.441530 version@stat F·[] S·0B[] Sc·[]
-19:17:45.447873 db@janitor F·2 G·0
-19:17:45.447904 db@open done T·8.491229ms
-19:17:46.886797 memdb@flush N·3 S·97B
-19:17:46.895029 memdb@flush created L0@3 N·3 S·186B "\ndb..ion,v3":"\nla..ime,v1"
-19:17:46.895113 version@stat F·[1] S·186B[186B] Sc·[0.25]
-19:17:46.902955 memdb@flush committed F·1 T·16.085023ms
-19:17:46.903047 journal@remove removed @1
-19:17:46.903085 table@compaction range L-1 "":""
-19:17:46.903111 table@compaction L0·1 -> L1·0 S·186B Q·3
-19:17:46.911317 table@build created L1@4 N·3 S·186B "\ndb..ion,v3":"\nla..ime,v1"
-19:17:46.911396 version@stat F·[0 1] S·186B[0B 186B] Sc·[0.00 0.00]
-19:17:46.919371 table@compaction committed F~ S~ Ke·0 D·0 T·16.225129ms
-19:17:46.919556 table@remove removed @3
-19:18:45.469927 memdb@flush N·6 S·222B
-19:18:45.483100 memdb@flush created L0@6 N·6 S·259B "\x04de..can,v9":"\npr..ion,v4"
-19:18:45.483187 version@stat F·[1 1] S·445B[259B 186B] Sc·[0.25 0.00]
-19:18:45.491263 memdb@flush committed F·1 T·21.239974ms
-19:18:45.491363 journal@remove removed @2
-19:18:45.491402 table@compaction range L-1 "":""
-19:18:45.491429 table@compaction L0·1 -> L1·1 S·445B Q·9
-19:18:45.499511 table@build created L1@7 N·9 S·333B "\x04de..can,v9":"\npr..ion,v4"
-19:18:45.499611 version@stat F·[0 1] S·333B[0B 333B] Sc·[0.00 0.00]
-19:18:45.508033 table@compaction committed F-1 S-112B Ke·0 D·0 T·16.563551ms
-19:18:45.508223 table@remove removed @6
-19:18:45.508284 table@remove removed @4
-21:22:01.085584 db@close closing
-21:22:01.086015 db@close done T·428.699µs
-=============== Jun 30, 2020 (CEST) ===============
-21:22:11.681870 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
-21:22:11.682759 version@stat F·[0 1] S·333B[0B 333B] Sc·[0.00 0.00]
-21:22:11.682825 db@open opening
-21:22:11.682972 journal@recovery F·1
-21:22:11.690589 journal@recovery recovering @5
-21:22:11.698723 memdb@flush created L0@8 N·2 S·176B "\x04de..can,v11":"\nla..ime,v10"
-21:22:11.711560 version@stat F·[1 1] S·509B[176B 333B] Sc·[0.25 0.00]
-21:22:11.734535 db@janitor F·4 G·0
-21:22:11.734580 db@open done T·51.737909ms
--- a/syncthing/config/index-v0.14.0.db/MANIFEST-000010
+++ b/syncthing/config/index-v0.14.0.db/MANIFEST-000010
--- a/syncthing/config/key.pem
+++ b/syncthing/config/key.pem
@ -1,6 +0,0 @@
-----BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDATt4bT/HcpqlA6terTY1DKFAMma7I24b1b0OJJxsm0kzD3c1KFwCCO
-y9On4T7H3+GgBwYFK4EEACKhZANiAAT6YI7+fYUirirBS/bM2jall+MK1hGhEukI
-UfJXbXe9x0aAzuzzR8dEjeaF9rzwmOGZ8VLaINI99aLv8HcVKple4VkTDfGUfh75
-PjybOxNh+zeAXALWFVU97Km5kIvXbxM=
-----END EC PRIVATE KEY-----
--- a/traefik.yml
+++ b/traefik.yml
@ -25,6 +25,14 @@ certificatesResolvers:
      httpChallenge:
        entryPoint: web
      tlsChallenge: {}
+  peek:
+    acme:
+      email: simon@milvert.com
+      storage: "/letsencrypt/acme_peek.json"
+      httpChallenge:
+        entryPoint: web
+      tlsChallenge: {}
+

 http:
  middlewares:
@ -37,5 +45,7 @@ entryPoints:
   address: ":80"
  web-secure:
   address: ":443"
+  influx:
+   address: ":8086"
  mqtt:
   address: ":9001"
--- a/syncthing/config/index-v0.14.0.db/LOCK
+++ b/syncthing/config/index-v0.14.0.db/LOCK
--- a/zigbee_home_2/configuration_home_2.yaml
+++ b/zigbee_home_2/configuration_home_2.yaml
@ -2,7 +2,7 @@ homeassistant: false
 permit_join: true
 mqtt:
  base_topic: zigbee_home_2
-  server: 'mqtt://10.0.0.3:1883'
+  server: 'mqtt://mqtt'
 advanced:
  log_level: debug
  pan_id: 6755
@ -29,7 +29,7 @@ devices:
  '0x000b57fffe96daab':
    friendly_name: billy_liten
  '0x000b57fffe915dbf':
-    friendly_name: matrum_hörn
+    friendly_name: matrum_fönster
  '0x000b57fffe96d90a':
    friendly_name: vrum_jordglob
  '0x000b57fffe9a3e5a':
@ -42,3 +42,8 @@ devices:
    friendly_name: vrum_läslampa
  '0xbc33acfffea0d682':
    friendly_name: vrum_tak
+groups:
+  '0':
+    friendly_name: vrum_tak_group
+    devices:
+      - 0xbc33acfffea0d682/1
--- a/zigbee_home_2/coordinator_backup.json
+++ b/zigbee_home_2/coordinator_backup.json
@ -1,6 +1,6 @@
 {
  "adapterType": "zStack",
-  "time": "Mon, 09 Nov 2020 15:31:39 GMT",
+  "time": "Fri, 20 Nov 2020 20:34:46 GMT",
  "meta": {
    "product": 1
  },
@ -28,7 +28,7 @@
      "osal": true,
      "product": -1,
      "value": [
-        67,
+        163,
        5,
        2,
        51,
@ -140,8 +140,8 @@
        0,
        0,
        0,
-        90,
-        1,
+        224,
+        5,
        0,
        0
      ],
@ -331,9 +331,9 @@
      "osal": false,
      "offset": 0,
      "value": [
-        11,
-        84,
-        0,
+        68,
+        121,
+        1,
        0,
        221,
        221,
--- a/zigbee_home_2/database.db
+++ b/zigbee_home_2/database.db
@ -1,9 +1,13 @@
 {"id":1,"type":"Coordinator","ieeeAddr":"0x00124b0021cbfbe0","nwkAddr":0,"manufId":0,"epList":[1,2,3,4,5,6,8,11,12,13,47,110,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"2":{"profId":257,"epId":2,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"3":{"profId":261,"epId":3,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"4":{"profId":263,"epId":4,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"5":{"profId":264,"epId":5,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"6":{"profId":265,"epId":6,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"8":{"profId":260,"epId":8,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"11":{"profId":260,"epId":11,"devId":1024,"inClusterList":[1281],"outClusterList":[1280,1282],"clusters":{},"binds":[],"meta":{}},"12":{"profId":49246,"epId":12,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"13":{"profId":260,"epId":13,"devId":5,"inClusterList":[25],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"47":{"profId":260,"epId":47,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"110":{"profId":260,"epId":110,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}}},"interviewCompleted":true,"meta":{},"lastSeen":null}
-{"id":2,"type":"Router","ieeeAddr":"0x000b57fffe96daab","nwkAddr":38861,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1604868396220}
-{"id":3,"type":"Router","ieeeAddr":"0x000b57fffe915dbf","nwkAddr":15363,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1604935971853}
-{"id":4,"type":"Router","ieeeAddr":"0x000b57fffe96d90a","nwkAddr":3767,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1604868360750}
-{"id":5,"type":"Router","ieeeAddr":"0x000b57fffe9a3e5a","nwkAddr":62865,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1604868348655}
-{"id":6,"type":"Router","ieeeAddr":"0xec1bbdfffeb46980","nwkAddr":17062,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1604777801518}
-{"id":7,"type":"EndDevice","ieeeAddr":"0xbc33acfffea767f3","nwkAddr":32870,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Battery","modelId":"TRADFRI on/off switch","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":2080,"inClusterList":[0,1,3,9,32,4096,64636],"outClusterList":[3,4,6,8,25,258,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI on/off switch","manufacturerName":"IKEA of Sweden","powerSource":3,"zclVersion":3,"appVersion":33,"stackVersion":98,"hwVersion":1,"dateCode":"20190723","swBuildId":"2.2.010"}},"genPowerCfg":{"attributes":{"batteryPercentageRemaining":87}}},"binds":[{"cluster":1,"type":"endpoint","deviceIeeeAddress":"0x00124b0021cbfbe0","endpointID":1}],"meta":{}}},"appVersion":33,"stackVersion":98,"hwVersion":1,"dateCode":"20190723","swBuildId":"2.2.010","zclVersion":3,"interviewCompleted":true,"meta":{"configured":1},"lastSeen":1604848517218}
-{"id":8,"type":"Router","ieeeAddr":"0x14b457fffe6ae838","nwkAddr":64261,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E27 WW clear 250lm","epList":[1,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64636],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E27 WW clear 250lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":3,"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050"}}},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[33],"outClusterList":[33],"clusters":{},"binds":[],"meta":{}}},"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1604779243253}
-{"id":9,"type":"Router","ieeeAddr":"0xbc33acfffea0d682","nwkAddr":29811,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E27 WW 806lm","epList":[1,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64636],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E27 WW 806lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":3,"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050"}}},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[33],"outClusterList":[33],"clusters":{},"binds":[],"meta":{}}},"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1604868313030}
+{"id":2,"type":"Router","ieeeAddr":"0x000b57fffe96daab","nwkAddr":38861,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1605984429758}
+{"id":3,"type":"Router","ieeeAddr":"0x000b57fffe915dbf","nwkAddr":15363,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1605964630866}
+{"id":4,"type":"Router","ieeeAddr":"0x000b57fffe96d90a","nwkAddr":3767,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1605980496360}
+{"id":5,"type":"Router","ieeeAddr":"0x000b57fffe9a3e5a","nwkAddr":62865,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1605985139281}
+{"id":6,"type":"Router","ieeeAddr":"0xec1bbdfffeb46980","nwkAddr":17062,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E14 W op/ch 400lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":256,"inClusterList":[0,3,4,5,6,8,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E14 W op/ch 400lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214"}}},"binds":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20170302","swBuildId":"1.2.214","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1605947611538}
+{"id":7,"type":"EndDevice","ieeeAddr":"0xbc33acfffea767f3","nwkAddr":32870,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Battery","modelId":"TRADFRI on/off switch","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":2080,"inClusterList":[0,1,3,9,32,4096,64636],"outClusterList":[3,4,6,8,25,258,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI on/off switch","manufacturerName":"IKEA of Sweden","powerSource":3,"zclVersion":3,"appVersion":33,"stackVersion":98,"hwVersion":1,"dateCode":"20190723","swBuildId":"2.2.010"}},"genPowerCfg":{"attributes":{"batteryPercentageRemaining":87}}},"binds":[{"cluster":1,"type":"endpoint","deviceIeeeAddress":"0x00124b0021cbfbe0","endpointID":1}],"meta":{}}},"appVersion":33,"stackVersion":98,"hwVersion":1,"dateCode":"20190723","swBuildId":"2.2.010","zclVersion":3,"interviewCompleted":true,"meta":{"configured":1},"lastSeen":1605981106926}
+{"id":8,"type":"Router","ieeeAddr":"0x14b457fffe6ae838","nwkAddr":64261,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E27 WW clear 250lm","epList":[1,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64636],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E27 WW clear 250lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":3,"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050"}}},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[33],"outClusterList":[33],"clusters":{},"binds":[],"meta":{}}},"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1605971884711}
+{"id":9,"type":"Router","ieeeAddr":"0xbc33acfffea0d682","nwkAddr":29811,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E27 WW 806lm","epList":[1,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64636],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E27 WW 806lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":3,"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050"}}},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[33],"outClusterList":[33],"clusters":{},"binds":[],"meta":{}}},"appVersion":32,"stackVersion":99,"hwVersion":2,"dateCode":"20181203","swBuildId":"2.3.050","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1605959713120}
+{"id":10,"type":"Group","groupID":1,"members":[],"meta":{}}
+{"id":11,"type":"Group","groupID":901,"members":[],"meta":{}}
+{"id":12,"type":"Coordinator","ieeeAddr":"0x00124b0021cbfbe0","nwkAddr":0,"manufId":0,"epList":[1,2,3,4,5,6,8,11,12,13,47,110,242],"endpoints":{"1":{"profId":260,"epId":1,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"2":{"profId":257,"epId":2,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"3":{"profId":261,"epId":3,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"4":{"profId":263,"epId":4,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"5":{"profId":264,"epId":5,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"6":{"profId":265,"epId":6,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"8":{"profId":260,"epId":8,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"11":{"profId":260,"epId":11,"devId":1024,"inClusterList":[1281],"outClusterList":[1280,1282],"clusters":{},"binds":[],"meta":{}},"12":{"profId":49246,"epId":12,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"13":{"profId":260,"epId":13,"devId":5,"inClusterList":[25],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"47":{"profId":260,"epId":47,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"110":{"profId":260,"epId":110,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":5,"inClusterList":[],"outClusterList":[],"clusters":{},"binds":[],"meta":{}}},"interviewCompleted":true,"meta":{},"lastSeen":null}
+{"id":13,"type":"Group","groupID":0,"members":[{"deviceIeeeAddr":"0xbc33acfffea0d682","endpointID":1}],"meta":{}}
--- a/zigbee_home_2/state.json
+++ b/zigbee_home_2/state.json
@ -1 +1 @@
-{"0x000b57fffe915dbf":{"brightness":51,"state":"ON","update_available":false},"0x000b57fffe96d90a":{"state":"OFF","update_available":false},"0x000b57fffe96daab":{"brightness":204,"state":"OFF","update_available":false},"0x000b57fffe9a3e5a":{"state":"OFF","update_available":false},"0x14b457fffe6ae838":{"state":"OFF","update_available":false},"0xbc33acfffea0d682":{"brightness":51,"state":"OFF","update_available":false},"0xbc33acfffea767f3":{"battery":87,"linkquality":162,"update_available":false},"0xec1bbdfffeb46980":{"update_available":false}}
+{"0":{"brightness":2,"state":"OFF"},"0x000b57fffe915dbf":{"brightness":66,"state":"ON","update_available":false},"0x000b57fffe96d90a":{"brightness":214,"state":"OFF","update_available":false},"0x000b57fffe96daab":{"brightness":28,"state":"ON","update_available":false},"0x000b57fffe9a3e5a":{"brightness":38,"state":"ON","update_available":false},"0x14b457fffe6ae838":{"state":"OFF","update_available":false},"0xbc33acfffea0d682":{"brightness":2,"state":"OFF","update_available":false},"0xbc33acfffea767f3":{"battery":87,"linkquality":45,"update_available":false},"0xec1bbdfffeb46980":{"brightness":102,"state":"OFF","update_available":false},"1":{"brightness":51,"state":"OFF"}}
				`@ -0,0 +1 @@`
				`Subproject commit 75ba28f3afa2b0c4baab06823411f02e1dea5f20`