From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Fri, 27 Jan 2023 21:35:59 +0000 (+0100)
Subject: Replaced certificate & minor changes to zigbee2mqtt
X-Git-Url: http://git.giorgioravera.it/?a=commitdiff_plain;h=52eb47bfa858bc809053536ef66ad6efa3c6243e;p=docker.git

Replaced certificate & minor changes to zigbee2mqtt
---

diff --git a/homeassistant/docker-compose.yaml b/homeassistant/docker-compose.yaml
index 16805f7..5e3c784 100644
--- a/homeassistant/docker-compose.yaml
+++ b/homeassistant/docker-compose.yaml
@@ -46,12 +46,12 @@ services:
       - TZ=${DOCKER_TZ}
     #group_add:
     #    - dialout
-    user: 1000:1000
+    user: 1000:dialout
     volumes:
       - ${DOCKER_CFG_DIR}/zigbee2mqtt:/app/data
       - /run/udev:/run/udev:ro
-    #devices:
-    #  - /dev/serial/by-id/usb-Texas_Instruments_TI_CC2531_USB_CDC___0X00124B0018E18D88-if00:/dev/ttyACM0
+    devices:
+      - /dev/serial/by-id/usb-Texas_Instruments_TI_CC2531_USB_CDC___0X00124B0018E18D88-if00:/dev/ttyACM0
     networks:
       - proxy
     labels:
@@ -89,7 +89,6 @@ services:
       - ${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:
diff --git a/traefik/docker-compose.yaml b/traefik/docker-compose.yaml
index c7590d6..a44fc37 100644
--- a/traefik/docker-compose.yaml
+++ b/traefik/docker-compose.yaml
@@ -23,8 +23,9 @@ services:
       - ${DOCKER_CFG_DIR}/traefik/passwd:/passwd
       #- ${DOCKER_CFG_DIR}/traefik/acme.json:/acme.json
       - ${DOCKER_CFG_DIR}/traefik/config:/config
-      #- ${DOCKER_CFG_DIR}/traefik/traefik.log:/traefik.log
-      - /etc/ssl/giorgioravera.it/fullchain.pem:/certs/fullchain.pem
+      - ${DOCKER_CFG_DIR}/traefik/traefik.log:/traefik.log
+      - ${DOCKER_CFG_DIR}/traefik/access.log:/access.log
+      - /etc/ssl/giorgioravera.it/cert.pem:/certs/cert.pem
       - /etc/ssl/giorgioravera.it/privkey.pem:/certs/privkey.pem
       - /var/run/docker.sock:/var/run/docker.sock
     network_mode: host