From 480ae5091a4fe5a9dce819144b63dcffd1c05b1b Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@tobru.ch>
Date: Mon, 25 May 2020 15:25:39 +0200
Subject: [PATCH] add recorder config - improve deployment

---
 owntracks/01-deployment.yaml   | 22 +++++++++++++++++-----
 owntracks/recorder-config.yaml | 16 ++++++++++++++++
 owntracks/views-configmap.yaml | 14 ++++++++++++++
 3 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 owntracks/recorder-config.yaml
 create mode 100644 owntracks/views-configmap.yaml

diff --git a/owntracks/01-deployment.yaml b/owntracks/01-deployment.yaml
index 35bdd31..6ddec00 100644
--- a/owntracks/01-deployment.yaml
+++ b/owntracks/01-deployment.yaml
@@ -20,16 +20,15 @@ spec:
       - env:
         - name: OTR_HOST
           value: mqtt-plain.mosquitto.svc.cluster.local
-        - name: OTR_PORT
-          value: "1883"
         - name: OTR_USER
           value: ot-recorder
-        envFrom:
-        - secretRef:
-            name: owntracks
         image: docker.io/owntracks/recorder:0.8.6-12
         imagePullPolicy: IfNotPresent
         name: recorder
+        command:
+        - ot-recorder
+        - --viewsdir
+        - /htdocs/viewsjson
         livenessProbe:
           exec:
             command:
@@ -42,8 +41,21 @@ spec:
         volumeMounts:
         - name: data
           mountPath: /store
+        - name: views
+          mountPath: /htdocs/viewsjson
+        - name: config
+          mountPath: /config
+        securityContext:
+          runAsUser: 9999
+          runAsGroup: 9999
       volumes:
       - name: data
         persistentVolumeClaim:
           claimName: owntracks-data
+      - name: views
+        configMap:
+          name: views
+      - name: config
+        secret:
+          secretName: recorder
 
diff --git a/owntracks/recorder-config.yaml b/owntracks/recorder-config.yaml
new file mode 100644
index 0000000..e038ed9
--- /dev/null
+++ b/owntracks/recorder-config.yaml
@@ -0,0 +1,16 @@
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  creationTimestamp: null
+  name: recorder
+  namespace: owntracks
+spec:
+  encryptedData:
+    recorder.conf: AgApnz/KNdcpHL83F9KT6CAXdZ6a+6FpYVXqQ7pvY+V3RJ+mg0o+A7qIcNkXSpYEzdN6uHDvfsJr9zOfaFaxT0Hdfdg3+UK5lr5f5YCgIYx+v34SDkcnc/rIqfrkVPSDTZZsW1PwU6qkPVqIeqv87me4IVqf2eIABH/yNxLFYC0Cpdg/8QcpXoYHyA7QHDlpEAmxhOVb/mSUfQH7myMnRdhrLtGY70/dRwVps9C7XopufIo4/KX35xHh+q9ekNb0hIsCQXoEmBkQZqrY0rfvktB1AYJo9qjSz1CzslWVDm1lPvqSES/Omy+YrgWs460ZJDBipCRDb7fnjcBxUVB1nOZxSmjBk90IWx6p8XNtyAmt5C4muKD2FhFh6HS6YZM1KYDFqkbPPe7vu1MOBnVAHs9CAqKRANTBRaLO4YGiH/smv6F6KTl2hVhiplodb6rL1k8BlkensQjNwbiwBJZ7guIJn1aEHh+Jy49TCJVuxTqLy7iY9nxfjP/GHSsYl5pDr2dBnct2DIJSSOG3scmubFqjbK1rPG51GxZtTKORSdvCo5gVsPW8z7XatGDWceQABr+sQTTs1nrWhVT6VOD8tMxO6BduMqv/AabE0vr0SZ6x3S58GkEXdFy7EpEKRC/YxLXfj6Gizr+gyIOcKisI88BmXRYjaMXN8/vK/UJdJ0cqTlj2uTr92gjLUBTZWHKdsL/+ZXUhwfhBKBQQK79GknpTiLQdVZsPzWobttv22AEvbPkEy/PDYjxv4rP/MRIjjH0LKVm3Gta+pwFHzTz+ZtdbXrGszb6N54KyL0r5k69TyrSxBE99OTiXLdmuS8/v9baerze4Hw/1Pqy7NkDcrEY0Ntv9AXnGniVZ9QVFahpEkuqGefsP8CSWwoIUihcXUjfzKEsINFD7rv8=
+  template:
+    metadata:
+      creationTimestamp: null
+      name: recorder
+      namespace: owntracks
+status: {}
+
diff --git a/owntracks/views-configmap.yaml b/owntracks/views-configmap.yaml
new file mode 100644
index 0000000..0cb5f56
--- /dev/null
+++ b/owntracks/views-configmap.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: views
+  namespace: owntracks
+data:
+  202005-soerenberg.json: |
+    {
+      "user"  : "tobru",
+      "device": "dragino",
+      "page"  : "vmap.html",
+      "from"  : "2020-05-15",
+      "to"    : "2020-05-23"
+    }