fix ot-recorder

ot-recorder/Dockerfile

@@ -18,7 +18,7 @@ ENV OTR_HOST       iot.eclipse.org
 ENV OTR_PORT       1883
 ENV OTR_HTTPHOST   0.0.0.0
 ENV OTR_HTTPPORT   8083
-ENV OTR_TOPICS     owntracks/+/+
+ENV OTR_TOPICS     owntracks/#
 ENV OTR_STORAGEDIR /var/spool/owntracks/recorder/store
 
 VOLUME $OTR_STORAGEDIR

ot-recorder/arm/Dockerfile

@@ -18,7 +18,7 @@ ENV OTR_HOST       iot.eclipse.org
 ENV OTR_PORT       1883
 ENV OTR_HTTPHOST   0.0.0.0
 ENV OTR_HTTPPORT   8083
-ENV OTR_TOPICS     owntracks/+/+
+ENV OTR_TOPICS     owntracks/#
 ENV OTR_STORAGEDIR /var/spool/owntracks/recorder/store
 
 VOLUME $OTR_STORAGEDIR

ot-recorder/arm/docker-compose.yml

@@ -11,6 +11,6 @@ ot-recorder:
     - OTR_PASS=password
     - OTR_CAFILE=/etc/ssl/certs/DST_Root_CA_X3.pem
     - OTR_TOPICS=owntracks/#
-    - OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+    # OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
     # OTR_OPTIONS=--debug
   restart: always

ot-recorder/arm/docker-entrypoint.sh

@@ -10,4 +10,4 @@ then
     ot-recorder --initialize
 fi
 
-exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS ${OTR_TOPICS:-owntracks/+/+}
+exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS ${OTR_TOPICS:-owntracks/#}

ot-recorder/docker-compose.yml

@@ -1,16 +1,29 @@
-ot-recorder:
-  image: vimagick/ot-recorder
-  ports:
-    - "8083:8083"
-  volumes:
-    - ./data:/var/spool/owntracks/recorder/store
-  environment:
-    - OTR_HOST=iot.eclipse.org
-    - OTR_PORT=8883
-    - OTR_USER=username
-    - OTR_PASS=password
-    - OTR_CAFILE=/etc/ssl/certs/DST_Root_CA_X3.pem
-    - OTR_TOPICS=owntracks/#
-    - OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    # OTR_OPTIONS=--debug
-  restart: always
+version: "3.7"
+
+services:
+
+  recorder:
+    image: vimagick/ot-recorder
+    ports:
+      - "8083:8083"
+    volumes:
+      - ./data:/var/spool/owntracks/recorder/store
+    environment:
+      - OTR_HOST=iot.eclipse.org
+      - OTR_PORT=8883
+      - OTR_USER=username
+      - OTR_PASS=password
+      - OTR_TOPICS=owntracks/#
+      - OTR_CAFILE=/etc/ssl/certs/DST_Root_CA_X3.pem
+      # OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      # OTR_OPTIONS=--debug
+    restart: unless-stopped
+
+  frontend:
+    image: owntracks/frontend
+    ports:
+      - 8080:80
+    environment:
+      - SERVER_HOST=recorder
+      - SERVER_PORT=8083
+    restart: unless-stopped

ot-recorder/docker-entrypoint.sh

@@ -10,4 +10,4 @@ then
     ot-recorder --initialize
 fi
 
-exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS ${OTR_TOPICS:-owntracks/+/+}
+exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS ${OTR_TOPICS:-owntracks/#}