From 8c8ce018200666747eef218ea2fec03e7336899a Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sat, 4 Apr 2020 04:29:04 +0200
Subject: [PATCH] containers/scrape: add scrape-{fhem,matemat}

---
 hosts/containers/scrape/configuration.nix | 22 ++++++++++++++++++++++
 secrets                                   |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/hosts/containers/scrape/configuration.nix b/hosts/containers/scrape/configuration.nix
index 266d864f..f3d1a900 100644
--- a/hosts/containers/scrape/configuration.nix
+++ b/hosts/containers/scrape/configuration.nix
@@ -33,6 +33,8 @@
         script = "${scrapers.${script}}/bin/${script} ${host} ${user} ${password}";
       };
       xeriLogin = import <secrets/hosts/scrape/xeri.nix>;
+      fhemLogin = import <secrets/hosts/scrape/fhem.nix>;
+      matematLogin = import <secrets/hosts/scrape/matemat.nix>;
     in {
       scrape-xeri = makeService {
         script = "xerox";
@@ -47,6 +49,16 @@
         script = "luftdaten";
         host = "";
       };
+      scrape-fhem = makeService {
+        script = "fhem";
+        host = "fhem.hq.c3d2.de";
+        inherit (fhemLogin) user password;
+      };
+      scrape-matemat = makeService {
+        script = "matemat";
+        host = "matemat.hq.c3d2.de";
+        inherit (matematLogin) user password;
+      };
     };
   systemd.timers.scrape-xeri = {
     partOf      = [ "scrape-xeri.service" ];
@@ -63,6 +75,16 @@
     wantedBy    = [ "timers.target" ];
     timerConfig.OnCalendar = "minutely";
   };
+  systemd.timers.scrape-fhem = {
+    partOf      = [ "scrape-fhem.service" ];
+    wantedBy    = [ "timers.target" ];
+    timerConfig.OnCalendar = "minutely";
+  };
+  systemd.timers.scrape-matemat = {
+    partOf      = [ "scrape-matemat.service" ];
+    wantedBy    = [ "timers.target" ];
+    timerConfig.OnCalendar = "minutely";
+  };
 
   # This value determines the NixOS release with which your system is to be
   # compatible, in order to avoid breaking some software such as database
diff --git a/secrets b/secrets
index 933f77d2..35a994c6 160000
--- a/secrets
+++ b/secrets
@@ -1 +1 @@
-Subproject commit 933f77d2e76d7b1cdc50807d3843736eac0efce0
+Subproject commit 35a994c6ea2f2720e8ec045ea1369163ea69a35f