From ad1d36cd0be65a35bc061827046786b87fbb7674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 8 May 2024 06:37:53 +0200 Subject: [PATCH] panoptikon: use plain diff and do not store git state --- modules/panoptikon.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/panoptikon.nix b/modules/panoptikon.nix index 9c600b6..120c69b 100644 --- a/modules/panoptikon.nix +++ b/modules/panoptikon.nix @@ -109,7 +109,7 @@ User = "panoptikon"; Group = "panoptikon"; WorkingDirectory = "/var/lib/panoptikon"; - RestartSec = "60"; + RestartSec = toString (60 * 60); Restart = "on-failure"; LoadCredential = watcherOptions.loadCredential; }; @@ -124,16 +124,16 @@ ${watcherOptions.script} > ${watcherName} - if [ -n "$(${pkgs.git}/bin/git diff -- ${watcherName})" ]; then + diff_output=$(${pkgs.diffutils}/bin/diff --new-file ${watcherName}.old ${watcherName}) + + if [ -n "$diff_output" ]; then ${lib.strings.concatMapStringsSep "\n" (reporter: '' - ${pkgs.git}/bin/git diff HEAD^ -- ${watcherName} | ${reporter} - '') - watcherOptions.reporters} + echo "$diff_output" | ${reporter} + '') watcherOptions.reporters} : fi - ${pkgs.git}/bin/git add ${watcherName} - ${pkgs.git}/bin/git commit --message "${watcherName} / $(${pkgs.coreutils}/bin/date -Is)" || : + mv ${watcherName} ${watcherName}.old ''; }) cfg.watchers;