From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Tue, 13 Oct 2020 16:21:31 +0000 (+0200)
Subject: Added zigbee2mqtt web page
X-Git-Url: http://git.giorgioravera.it/?a=commitdiff_plain;h=47914af085c21884f6787eacdd5ebbff142e02b8;p=docker.git

Added zigbee2mqtt web page
---

diff --git a/homeassistant/docker-compose.yaml b/homeassistant/docker-compose.yaml
deleted file mode 120000
index 40d5868..0000000
--- a/homeassistant/docker-compose.yaml
+++ /dev/null
@@ -1 +0,0 @@
-docker-compose.yaml.host
\ No newline at end of file
diff --git a/homeassistant/docker-compose.yaml b/homeassistant/docker-compose.yaml
new file mode 100644
index 0000000..c623bd4
--- /dev/null
+++ b/homeassistant/docker-compose.yaml
@@ -0,0 +1,96 @@
+version: '3'
+
+services:
+  homeassistant:
+    container_name: homeassistant
+    image: homeassistant/home-assistant:latest
+    #command: --log-file /config/log/home-assistant.log
+    restart: always
+    #ports:
+    #  - 8123:8123
+    depends_on:
+      - zigbee2mqtt
+      - mosquitto
+    environment:
+      - TZ=${DOCKER_TZ}
+    #privileged: true
+    dns: 192.168.0.254
+    volumes:
+      - ${DOCKER_CFG_DIR}/homeassistant:/config
+    network_mode: host
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.homeassistant.entrypoints=http"
+      - "traefik.http.routers.homeassistant.rule=Host(`home.giorgioravera.it`)"
+      #- "traefik.http.routers.homeassistant.service=homeassistant"
+      - "traefik.http.routers.homeassistant.middlewares=homeassistant-https-redirect"
+      - "traefik.http.routers.homeassistant-secure.entrypoints=https"
+      - "traefik.http.routers.homeassistant-secure.rule=Host(`home.giorgioravera.it`)"
+      - "traefik.http.routers.homeassistant-secure.tls=true"
+      #- "traefik.http.routers.homeassistant-secure.tls.certresolver=http"
+      - "traefik.http.routers.homeassistant-secure.service=homeassistant"
+      - "traefik.http.middlewares.homeassistant-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.services.homeassistant.loadbalancer.server.port=8123"
+
+  zigbee2mqtt:
+    container_name: zigbee2mqtt
+    image: koenkk/zigbee2mqtt:latest
+    restart: always
+    #ports:
+    #  - 8080:8080
+    depends_on:
+      - mosquitto
+    environment:
+      - TZ=${DOCKER_TZ}
+    #privileged: true
+    volumes:
+      - ${DOCKER_CFG_DIR}/zigbee2mqtt:/app/data
+      - /etc/ssl/giorgioravera.it/chain.pem:/etc/ssl/mqtt-ca.crt
+      #- /run/udev:/run/udev:ro
+    devices:
+      - /dev/ttyACM0:/dev/ttyACM0
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.zigbee2mqtt.entrypoints=http"
+      - "traefik.http.routers.zigbee2mqtt.rule=Host(`home.giorgioravera.it`) && PathPrefix(`/zigbee2mqtt`)"
+      - "traefik.http.routers.zigbee2mqtt.service=zigbee2mqtt"
+      - "traefik.http.routers.zigbee2mqtt.middlewares=zigbee2mqtt-stripprefix"
+      #- "traefik.http.routers.zigbee2mqtt.middlewares=zigbee2mqtt-https-redirect"
+      - "traefik.http.routers.zigbee2mqtt-secure.entrypoints=https"
+      - "traefik.http.routers.zigbee2mqtt-secure.rule=Host(`home.giorgioravera.it`) && PathPrefix(`/zigbee2mqtt`)"
+      - "traefik.http.routers.zigbee2mqtt-secure.tls=true"
+      #- "traefik.http.routers.zigbee2mqtt-secure.tls.certresolver=http"
+      - "traefik.http.routers.zigbee2mqtt-secure.service=zigbee2mqtt"
+      - "traefik.http.routers.zigbee2mqtt-secure.middlewares=zigbee2mqtt-stripprefix"
+      #- "traefik.http.middlewares.zigbee2mqtt-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.middlewares.zigbee2mqtt-stripprefix.stripprefix.prefixes=/zigbee2mqtt"
+      - "traefik.http.services.zigbee2mqtt.loadbalancer.server.port=8080"
+
+  mosquitto:
+    container_name: mosquitto
+    image: eclipse-mosquitto:latest
+    restart: always
+    ports:
+      - 1883:1883
+      - 8883:8883
+      - 8083:8083
+    environment:
+      - TZ=${DOCKER_TZ}
+    #user: "1883:1883"
+    volumes:
+      - ${DOCKER_CFG_DIR}/mosquitto/data:/mosquitto/data
+      - ${DOCKER_CFG_DIR}/mosquitto/config:/mosquitto/config
+      - ${DOCKER_CFG_DIR}/mosquitto/log:/mosquitto/log
+      - /etc/ssl/giorgioravera.it/chain.pem:/certs/chain.pem
+      - /etc/ssl/giorgioravera.it/cert.pem:/certs/cert.pem
+      - /etc/ssl/giorgioravera.it/privkey.pem:/certs/privkey.pem
+    networks:
+      - proxy
+    labels:
+      - traefik.enable=false
+
+networks:
+  proxy:
+    external: true
diff --git a/homeassistant/docker-compose.yaml.host b/homeassistant/docker-compose.yaml.host
deleted file mode 100644
index 2dbd0c3..0000000
--- a/homeassistant/docker-compose.yaml.host
+++ /dev/null
@@ -1,79 +0,0 @@
-version: '3'
-
-services:
-  homeassistant:
-    container_name: homeassistant
-    image: homeassistant/home-assistant:latest
-    #command: --log-file /config/log/home-assistant.log
-    restart: always
-    #ports:
-    #  - 8123:8123
-    depends_on:
-      - zigbee2mqtt
-      - mosquitto
-    environment:
-      - TZ=${DOCKER_TZ}
-    #privileged: true
-    dns: 192.168.0.254
-    volumes:
-      - ${DOCKER_CFG_DIR}/homeassistant:/config
-    network_mode: host
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.homeassistant.entrypoints=http"
-      - "traefik.http.routers.homeassistant.rule=Host(`home.giorgioravera.it`)"
-      #- "traefik.http.routers.homeassistant.service=homeassistant"
-      - "traefik.http.routers.homeassistant.middlewares=homeassistant-https-redirect"
-      - "traefik.http.routers.homeassistant-secure.entrypoints=https"
-      - "traefik.http.routers.homeassistant-secure.rule=Host(`home.giorgioravera.it`)"
-      - "traefik.http.routers.homeassistant-secure.tls=true"
-      #- "traefik.http.routers.homeassistant-secure.tls.certresolver=http"
-      - "traefik.http.routers.homeassistant-secure.service=homeassistant"
-      - "traefik.http.middlewares.homeassistant-https-redirect.redirectscheme.scheme=https"
-      - "traefik.http.services.homeassistant.loadbalancer.server.port=8123"
-
-  zigbee2mqtt:
-    container_name: zigbee2mqtt
-    image: koenkk/zigbee2mqtt:latest
-    restart: always
-    depends_on:
-      - mosquitto
-    environment:
-      - TZ=${DOCKER_TZ}
-    #privileged: true
-    volumes:
-      - ${DOCKER_CFG_DIR}/zigbee2mqtt:/app/data
-      #- /run/udev:/run/udev:ro
-    devices:
-      - /dev/ttyACM0:/dev/ttyACM0
-    networks:
-      - proxy
-    labels:
-    - traefik.enable=false
-
-  mosquitto:
-    container_name: mosquitto
-    image: eclipse-mosquitto:latest
-    restart: always
-    ports:
-      - 1883:1883
-      - 8883:8883
-      - 8083:8083
-    environment:
-      - TZ=${DOCKER_TZ}
-    #user: "1883:1883"
-    volumes:
-      - ${DOCKER_CFG_DIR}/mosquitto/data:/mosquitto/data
-      - ${DOCKER_CFG_DIR}/mosquitto/config:/mosquitto/config
-      - ${DOCKER_CFG_DIR}/mosquitto/log:/mosquitto/log
-      - /etc/ssl/giorgioravera.it/chain.pem:/certs/chain.pem
-      - /etc/ssl/giorgioravera.it/cert.pem:/certs/cert.pem
-      - /etc/ssl/giorgioravera.it/privkey.pem:/certs/privkey.pem
-    networks:
-      - proxy
-    labels:
-    - traefik.enable=false
-
-networks:
-  proxy:
-    external: true
diff --git a/homeassistant/docker-compose.yaml.net b/homeassistant/docker-compose.yaml.net
deleted file mode 100644
index 7a27bda..0000000
--- a/homeassistant/docker-compose.yaml.net
+++ /dev/null
@@ -1,83 +0,0 @@
-version: '3'
-
-services:
-  homeassistant:
-    container_name: homeassistant
-    image: homeassistant/home-assistant:stable
-    #command: --log-file /config/log/home-assistant.log
-    restart: always
-    ports:
-      - 8123:8123
-    depends_on:
-      - zigbee2mqtt
-      - mosquitto
-    environment:
-      - TZ=${DOCKER_TZ}
-    #privileged: true
-    #user: "1001:1000"
-    dns: 192.168.0.254 192.168.0.1
-    volumes:
-      - ${DOCKER_CFG_DIR}/homeassistant:/config
-    networks:
-      - proxy
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.homeassistant.entrypoints=http"
-      - "traefik.http.routers.homeassistant.rule=Host(`home.giorgioravera.it`)"
-      #- "traefik.http.routers.homeassistant.service=homeassistant"
-      - "traefik.http.routers.homeassistant.middlewares=homeassistant-https-redirect"
-      - "traefik.http.routers.homeassistant-secure.entrypoints=https"
-      - "traefik.http.routers.homeassistant-secure.rule=Host(`home.giorgioravera.it`)"
-      - "traefik.http.routers.homeassistant-secure.tls=true"
-      #- "traefik.http.routers.homeassistant-secure.tls.certresolver=http"
-      - "traefik.http.routers.homeassistant-secure.service=homeassistant"
-      - "traefik.http.middlewares.homeassistant-https-redirect.redirectscheme.scheme=https"
-      - "traefik.http.services.homeassistant.loadbalancer.server.port=8123"
-      - "traefik.docker.network=proxy"
-
-  zigbee2mqtt:
-    container_name: zigbee2mqtt
-    image: koenkk/zigbee2mqtt
-    restart: always
-    depends_on:
-      - mosquitto
-    environment:
-      - TZ=${DOCKER_TZ}
-    privileged: true
-    dns: 192.168.0.254 192.168.0.1
-    volumes:
-      - ${DOCKER_CFG_DIR}/zigbee2mqtt:/app/data
-      - /run/udev:/run/udev:ro
-    devices:
-      - /dev/ttyACM0:/dev/ttyACM0
-    network_mode: host
-    labels:
-    - traefik.enable=false
-
-  mosquitto:
-    container_name: mosquitto
-    image: eclipse-mosquitto:latest
-    restart: always
-    #ports:
-    #  - 1883:1883
-    #  - 8883:8883
-    #  - 8083:8083
-    environment:
-      - TZ=${DOCKER_TZ}
-    #privileged: true
-    user: "1883:1883"
-    dns: 192.168.0.254 192.168.0.1
-    volumes:
-      - ${DOCKER_CFG_DIR}/mosquitto/data:/mosquitto/data
-      - ${DOCKER_CFG_DIR}/mosquitto/config:/mosquitto/config
-      - ${DOCKER_CFG_DIR}/mosquitto/log:/mosquitto/log
-      - /etc/ssl/giorgioravera.it/chain.pem:/certs/chain.pem
-      - /etc/ssl/giorgioravera.it/cert.pem:/certs/cert.pem
-      - /etc/ssl/giorgioravera.it/privkey.pem:/certs/privkey.pem
-    network_mode: host
-    labels:
-    - traefik.enable=false
-
-networks:
-  proxy:
-    external: true