From 6fb2459a49098107999dbd6460325d9b3183fa8d Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 25 Sep 2019 15:05:29 +0200 Subject: ma stats/arafetch: use new version to send aramark information to mqtt --- makefu/2configs/stats/arafetch.nix | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'makefu/2configs/stats') diff --git a/makefu/2configs/stats/arafetch.nix b/makefu/2configs/stats/arafetch.nix index 6ab9d3774..a078e3646 100644 --- a/makefu/2configs/stats/arafetch.nix +++ b/makefu/2configs/stats/arafetch.nix @@ -2,18 +2,19 @@ with import ; let pkg = with pkgs.python3Packages;buildPythonPackage rec { - rev = "775d0c2"; + rev = "cce2394"; name = "arafetch-${rev}"; propagatedBuildInputs = [ requests docopt influxdb beautifulsoup4 + paho-mqtt ]; src = pkgs.fetchgit { url = "http://cgit.euer.krebsco.de/arafetch"; inherit rev; - sha256 = "0z35avn7vmbd1661ca1zkc9i4lwcm03kpwgiqxddpkp1yxhl548p"; + sha256 = "sha256:0zdz8sqn9n8i69rqngcg7nakmvahf1i5dwajzjpylsh1x5csv2gs"; }; }; home = "/var/lib/arafetch"; @@ -24,13 +25,25 @@ in { createHome = true; }; + systemd.services.ara2mqtt = { + startAt = "05:00:00"; + after = [ "network-online.target" ]; + path = [ pkg ]; + serviceConfig = { + User = "arafetch"; + # Restart = "always"; + WorkingDirectory = home; + PrivateTmp = true; + ExecStart = pkgs.writeDash "daily-mqtt" '' + ara2mqtt db/thales-deutschland.json --cantine thales-deutschland --host localhost + ''; + }; + }; systemd.services.arafetch = { startAt = "Mon,Wed,Fri 09:15:00"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; - environment = { - OUTDIR = home; - }; + environment.OUTDIR = home; path = [ pkg pkgs.git pkgs.wget ]; serviceConfig = { User = "arafetch"; @@ -38,7 +51,6 @@ in { 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##*/} -- cgit v1.2.3