config/hosts/public-web-static/spaceapid-config/ccchh-dynamic.json

@@ -2,6 +2,26 @@
   "dynamic": {
     "sensors": {
       "temperature": [
+        {
+          "sensor_data": {
+            "unit": "°C",
+            "location": "Hauptraum",
+            "description": "Sensor im Hauptraum"
+          },
+          "allowed_credentials": [
+            "club-assistant"
+          ]
+        },
+        {
+          "sensor_data": {
+            "unit": "°C",
+            "location": "Loetschlauch",
+            "description": "Sensor im Lötschlauch (Teil der Werkstatt)"
+          },
+          "allowed_credentials": [
+            "club-assistant"
+          ]
+        },
         {
           "sensor_data": {
             "unit": "°C",
@@ -14,6 +34,26 @@
         }
       ],
       "humidity": [
+        {
+          "sensor_data": {
+            "unit": "%",
+            "location": "Hauptraum",
+            "description": "Sensor im Hauptraum"
+          },
+          "allowed_credentials": [
+            "club-assistant"
+          ]
+        },
+        {
+          "sensor_data": {
+            "unit": "%",
+            "location": "Loetschlauch",
+            "description": "Sensor im Lötschlauch (Teil der Werkstatt)"
+          },
+          "allowed_credentials": [
+            "club-assistant"
+          ]
+        },
         {
           "sensor_data": {
             "unit": "%",
@@ -24,6 +64,28 @@
             "club-assistant"
           ]
         }
+      ],
+      "CO2": [
+        {
+          "sensor_data": {
+            "unit": "ppm",
+            "location": "Hauptraum",
+            "description": "Sensor im Hauptraum (Typ: SCD41)"
+          },
+          "allowed_credentials": [
+            "club-assistant"
+          ]
+        },
+        {
+          "sensor_data": {
+            "unit": "ppm",
+            "location": "Loetschlauch",
+            "description": "Sensor im Lötschlauch (Teil der Werkstatt, Typ: SCD41)"
+          },
+          "allowed_credentials": [
+            "club-assistant"
+          ]
+        }
       ]
     },
     "state": {

config/hosts/public-web-static/spaceapid.nix

@@ -1,20 +1,19 @@
 { pkgs, ... }:
 
 let
-  version = "v0.1.0";
+  spaceapidSrc = builtins.fetchGit {
-  spaceapidSrc = pkgs.fetchgit {
     url = "https://git.hamburg.ccc.de/CCCHH/spaceapid.git";
-    rev = version;
+    ref = "main";
-    hash = "sha256-2SDhliltzyydPPZdNn/htDydiK/SHQcYyG/dQ0EyFrY=";
+    rev = "17753f535c68157e80f30f50deb488133cc98258";
   };
   spaceapid = pkgs.buildGoModule rec {
     pname = "spaceapid";
-    inherit version;
+    version = "main";
 
     src = spaceapidSrc;
 
     ldflags = [
-      "-X main.version=${version}"
+      "-X main.version=${version}-${spaceapidSrc.rev}"
     ];
 
     # Since spaceapid doesn't have any dependencies, we can set this to null and