From c45a087dfd192a8da324390409b8ef2556849d17 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 24 May 2020 21:58:13 +0200
Subject: [PATCH] freifunk: update to accommodate sysinfo changes in
 ffdd-server.git

---
 hosts/containers/freifunk/configuration.nix | 1 +
 hosts/containers/freifunk/sysinfo-json.nix  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hosts/containers/freifunk/configuration.nix b/hosts/containers/freifunk/configuration.nix
index a9c8b65f..ee45669d 100644
--- a/hosts/containers/freifunk/configuration.nix
+++ b/hosts/containers/freifunk/configuration.nix
@@ -154,6 +154,7 @@ in {
     timerConfig.OnCalendar = "daily";
   };
 
+  environment.etc."freifunk-server-version".text = "Custom NixOS configuration: 0.0.0";
   # Refresh sysinfo.json
   systemd.services.sysinfo-json = {
     script = ''
diff --git a/hosts/containers/freifunk/sysinfo-json.nix b/hosts/containers/freifunk/sysinfo-json.nix
index 3aafe3c2..d374b5a0 100644
--- a/hosts/containers/freifunk/sysinfo-json.nix
+++ b/hosts/containers/freifunk/sysinfo-json.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
       --replace awk ${gawk}/bin/awk
   '' +
   lib.strings.concatStrings (lib.attrsets.mapAttrsToList (
-    var: value: "substituteInPlace sysinfo-json.cgi --replace ${lib.strings.escapeShellArg "$(nvram get ${var})"} '${value}'\n"
+    var: value: "substituteInPlace sysinfo-json.cgi --replace ${lib.strings.escapeShellArg "$(uci -qX get ffdd.sys.${var})"} '${value}'\n"
   ) nvram);
   installPhase = ''
     pwd