Merge branch 'main' into feature/526-average-resample

configs/config-demo.json

@@ -9,7 +9,9 @@
   },
   "auth": {
     "jwts": {
-      "max-age": "2000h"
+      "max-age": "2000h",
+      "public-key": "kzfYrYy+TzpanWZHJ5qSdMj5uKUWgq74BWhQG6copP0=",
+      "private-key": "dtPC/6dWJFKZK7KZ78CvWuynylOmjBFyMsUWArwmodOTN9itjL5POlqdZkcnmpJ0yPm4pRaCrvgFaFAbpyik/Q=="
     }
   },
   "metric-store-external": [

configs/config.json

@@ -17,6 +17,10 @@
       "default-policy": "medium",
       "default-algo": "lttb"
     },
+    "footer-links": {
+      "imprint": "/imprint",
+      "privacy": "/privacy"
+    },
     "api-subjects": {
       "subject-job-event": "cc.job.event",
       "subject-node-state": "cc.node.state"
@@ -29,7 +33,9 @@
   },
   "auth": {
     "jwts": {
-      "max-age": "2000h"
+      "max-age": "2000h",
+      "public-key": "kzfYrYy+TzpanWZHJ5qSdMj5uKUWgq74BWhQG6copP0=",
+      "private-key": "dtPC/6dWJFKZK7KZ78CvWuynylOmjBFyMsUWArwmodOTN9itjL5POlqdZkcnmpJ0yPm4pRaCrvgFaFAbpyik/Q=="
     }
   },
   "cron": {

configs/env-template.txt

@@ -1,14 +0,0 @@
-# Base64 encoded Ed25519 keys (DO NOT USE THESE TWO IN PRODUCTION!)
-# You can generate your own keypair using `go run tools/gen-keypair/main.go`
-JWT_PUBLIC_KEY="kzfYrYy+TzpanWZHJ5qSdMj5uKUWgq74BWhQG6copP0="
-JWT_PRIVATE_KEY="dtPC/6dWJFKZK7KZ78CvWuynylOmjBFyMsUWArwmodOTN9itjL5POlqdZkcnmpJ0yPm4pRaCrvgFaFAbpyik/Q=="
-
-# Base64 encoded Ed25519 public key for accepting externally generated JWTs
-# Keys in PEM format can be converted, see `tools/convert-pem-pubkey/Readme.md`
-CROSS_LOGIN_JWT_PUBLIC_KEY=""
-
-# Some random bytes used as secret for cookie-based sessions (DO NOT USE THIS ONE IN PRODUCTION)
-SESSION_KEY="67d829bf61dc5f87a73fd814e2c9f629"
-
-# Password for the ldap server (optional)
-LDAP_ADMIN_PASSWORD="mashup"