From 9874b7c25dc469d701c0e658baeb1f5f33991b26 Mon Sep 17 00:00:00 2001
From: David Gwilliam <dhgwilliam@gmail.com>
Date: Sat, 5 Sep 2026 00:17:05 +0000
Subject: [PATCH] =?UTF-8?q?infra:=20Pi=20wiring/runtime=20config=20?=
 =?UTF-8?q?=E2=80=94=20ttyUSB0,=20poll=2060s,=20gateway=20SYS=20metrics,?=
 =?UTF-8?q?=20token=20via=20env=5Ffile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                            | 3 +++
 infra/compose.yaml                    | 6 ++++--
 infra/meshtastic-mqtt/acl.conf        | 1 +
 infra/meshtastic-mqtt/mosquitto.conf  | 2 ++
 infra/mosquitto/config/mosquitto.conf | 2 ++
 infra/zigbee2mqtt/configuration.yaml  | 2 +-
 6 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a2fb292..d087df3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,6 @@ infra/nodered/flows_cred.json
 
 # operator tool pin
 mise.toml
+
+# per-service local secrets (env_file) - never commit
+infra/**/.env
diff --git a/infra/compose.yaml b/infra/compose.yaml
index ff54efd..57baaf0 100644
--- a/infra/compose.yaml
+++ b/infra/compose.yaml
@@ -41,7 +41,7 @@ services:
       - ./zigbee2mqtt:/app/data
     devices:
       - source: /dev/serial/by-id/usb-1a86_USB_Serial-if00-port0
-        target: /dev/ttyUSB1
+        target: /dev/ttyUSB0
         permissions: rw
     entrypoint: ["/app/data/scripts/entrypoint.sh"]
     command: ["/sbin/tini", "--", "node", "index.js"]
@@ -102,12 +102,14 @@ services:
         condition: service_healthy
     volumes:
       - ./doorbell-listener/state:/data/doorbell-listener
+    env_file:
+      - ./doorbell-listener/.env
     environment:
       MQTT_HOST: 192.168.81.147
       MQTT_PORT: "1883"
       PLUG_TOPIC: "zigbee2mqtt/Squiggle/set"
       PROBE_PLUG_TOPIC: "zigbee2mqtt/DoorbellProbe/set"
-      POLL_INTERVAL: "5"
+      POLL_INTERVAL: "60"
       MAX_AGE_SECONDS: "180"
       FLASH_INTERVAL_SECONDS: "1"
       FLASH_DURATION_SECONDS: "7"
diff --git a/infra/meshtastic-mqtt/acl.conf b/infra/meshtastic-mqtt/acl.conf
index bea8b6f..89193cf 100644
--- a/infra/meshtastic-mqtt/acl.conf
+++ b/infra/meshtastic-mqtt/acl.conf
@@ -1 +1,2 @@
 topic readwrite msh/#
+topic read $SYS/#
diff --git a/infra/meshtastic-mqtt/mosquitto.conf b/infra/meshtastic-mqtt/mosquitto.conf
index 971c9be..701a267 100644
--- a/infra/meshtastic-mqtt/mosquitto.conf
+++ b/infra/meshtastic-mqtt/mosquitto.conf
@@ -3,3 +3,5 @@ allow_anonymous true
 acl_file /mosquitto/config/acl.conf
 persistence false
 log_dest stdout
+
+sys_interval 10
diff --git a/infra/mosquitto/config/mosquitto.conf b/infra/mosquitto/config/mosquitto.conf
index b9217f9..90b2be8 100644
--- a/infra/mosquitto/config/mosquitto.conf
+++ b/infra/mosquitto/config/mosquitto.conf
@@ -7,3 +7,5 @@ password_file /mosquitto/config/passwd
 persistence true
 persistence_location /mosquitto/data
 log_dest file /mosquitto/log/mosquitto.log
+
+sys_interval 10
diff --git a/infra/zigbee2mqtt/configuration.yaml b/infra/zigbee2mqtt/configuration.yaml
index 0959524..11fb9f9 100644
--- a/infra/zigbee2mqtt/configuration.yaml
+++ b/infra/zigbee2mqtt/configuration.yaml
@@ -3,7 +3,7 @@ mqtt:
   base_topic: zigbee2mqtt
   server: mqtt://mosquitto:1883
 serial:
-  port: /dev/ttyUSB1
+  port: /dev/ttyUSB0
   adapter: blz
   baudrate: 2000000
   rtscts: false