Merge remote-tracking branch 'origin/master'

1 files changed, 16 insertions, 3 deletions

diff --git a/makefu/2configs/stats/arafetch.nix b/makefu/2configs/stats/arafetch.nix
index e04b12f9c..422676b24 100644
--- a/makefu/2configs/stats/arafetch.nix
+++ b/makefu/2configs/stats/arafetch.nix
@@ -3,7 +3,7 @@ with import <stockholm/lib>;
 let
   pkg = with pkgs.python3Packages;buildPythonPackage rec {
     rev = "762d747";
-    name = "europastats-${rev}";
+    name = "arafetch-${rev}";
     propagatedBuildInputs = [
       requests
       docopt
@@ -25,12 +25,25 @@ in {
   };
 
   systemd.services.arafetch = {
-    startAt = "Mon 09:15:00";
+    startAt = "Mon,Wed,Fri 09:15:00";
     wantedBy = [ "multi-user.target" ];
     environment = {
       OUTDIR = home;
     };
     path = [ pkg  pkgs.git pkgs.wget ];
-    script = "${pkg}/bin/weekrun";
+    serviceConfig = {
+      User = "arafetch";
+      WorkingDirectory = home;
+      PrivateTmp = true;
+      ExecStart = pkgs.writeDash "start-weekrun" ''
+        set -x
+        weekrun || echo "weekrun failed!"
+        find $OUTDIR/db -name \*.json | while read path;do
+          file=''${path##*/}
+          cantine=''${file%%.json}
+          ara2influx $path --cantine $cantine --host wbob.r
+        done
+      '';
+    };
   };
 }