CCCHH/nix-infra
CCCHH/nix-infra
2
3
Fork 3
Code Issues Pull requests 2 Projects Wiki Activity

Compare commits

base: CCCHH:faffcb7d5482f3d1079cd40cc76cfcdc5196b60b
Branches Tags
CCCHH:main
CCCHH:ci-check-lix
CCCHH:ci-check
CCCHH:yate
CCCHH:simple-clean-up
CCCHH:nixOptions
CCCHH:spaceapi
CCCHH:ptouch-print-server
CCCHH:Bendodroid-ldflagsSpaceapid
..
compare: CCCHH:028b5dc9e829a989a24a22109f17ee06137931d3
Branches Tags
CCCHH:ci-check-lix
CCCHH:main
CCCHH:ci-check
CCCHH:yate
CCCHH:simple-clean-up
CCCHH:nixOptions
CCCHH:spaceapi
CCCHH:ptouch-print-server
CCCHH:Bendodroid-ldflagsSpaceapid

No commits in common. "faffcb7d5482f3d1079cd40cc76cfcdc5196b60b" and "028b5dc9e829a989a24a22109f17ee06137931d3" have entirely different histories.
faffcb7d54 ... 028b5dc9e8

2 changed files with 67 additions and 6 deletions
Show stats Expand all files Collapse all files

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

@ -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": {

11
config/hosts/public-web-static/spaceapid.nix
View file

@ -1,20 +1,19 @@
{ pkgs, ... }:
let
version = "v0.1.0";
spaceapidSrc = pkgs.fetchgit {
spaceapidSrc = builtins.fetchGit {
url = "https://git.hamburg.ccc.de/CCCHH/spaceapid.git";
rev = version;
hash = "sha256-2SDhliltzyydPPZdNn/htDydiK/SHQcYyG/dQ0EyFrY=";
ref = "main";
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