flora: fix the trainspotter script

2 files changed, 8 insertions, 8 deletions

diff --git a/flora/services/urlwatcher.nix b/flora/services/trainspotter.nix
index 5b6d7bf..5b81f7e 100644
--- a/flora/services/urlwatcher.nix
+++ b/flora/services/trainspotter.nix
@@ -1,15 +1,15 @@
 { config, lib, pkgs, ... }:
 
 {
-  systemd.services.urlwatcher-ilztal = {
+  systemd.services.trainspotter = {
     enable = true;
     description = "script watching the ilztalbahn gtfs for changes";
     wantedBy = [ "multi-user.target" ];
     after = [ "network.target" ];
     serviceConfig.Type = "simple";
-    path = with pkgs; [ curl libzip system-sendmail ];
+    path = with pkgs; [ curl libzip mailutils ];
     script = ''
-      ${pkgs.gauche}/bin/gosh ${pkgs.copyPathToStore ./urlwatcher.scm}
+      ${pkgs.gauche}/bin/gosh ${pkgs.copyPathToStore ./trainspotter.scm}
     '';
     startAt = "daily";
   };
diff --git a/flora/services/urlwatcher.scm b/flora/services/trainspotter.scm
index 0519903..860f0ab 100644
--- a/flora/services/urlwatcher.scm
+++ b/flora/services/trainspotter.scm
@@ -31,18 +31,18 @@
                       (process-output->string `(zipcmp ,oldfile ,newfile)))
                     "")])
       (do-pipeline `((echo ,(format "
-From: urlwatcher@flora.stuebinm.eu
-Subject: Ilztalbahn GTFS Update
 
-Neuer hash: ~a
-Link: ~a
+Neuer hash ist ~a
+Link ist ~a
 
 ~a
 
 (~a)
 
 " newhash url diff pretty-date))
-                     (sendmail "stuebinm@disroot.org" "-t")))
+                     (mail "-s" "Ilztalbahn GTFS Update"
+                           "stuebinm@disroot.org"
+                           "-a" "From: trainspotter@flora.stuebinm.eu")))
       (sexp-list->file
        cachefile
        (list (list pretty-date newhash))