develop: ntfy-sh: fixing check-domains

Author: sid115

modules/nixos/ntfy-sh/check-domain.sh

@@ -16,12 +16,20 @@ MAX_ATTEMPTS=3
 
 # check if website is up
 check_website() {
-  curl -s -w "%{http_code} %{url_effective}\n" -I "$FQDN" > /dev/null && return 0 || return 1
+  if curl -s -w "%{http_code} %{url_effective}\n" -I "$FQDN" > /dev/null; then
+    return 0
+  else
+    return 1
+  fi
 }
 
 # send notification via ntfy
 send_notification() {
-  curl -s -d "$1" http://127.0.0.1:2586/"$NTFY_TOPIC" && return 0 || return 1
+  if curl -s -d "$1" http://127.0.0.1:2586/"$NTFY_TOPIC"; then
+    return 0
+  else
+    return 1
+  fi
 }
 
 # perform checks

modules/nixos/ntfy-sh/default.nix

@@ -23,10 +23,11 @@ let
 
   fqdn = stripProtocol cfg.settings.base-url;
 
-  check-domain = pkgs.writeShellApplication {
+  check-domain = pkgs.writeShellApplication rec {
     name = "check-domain";
     runtimeInputs = [ pkgs.curl ];
-    text = readFile ./check-domain.sh;
+    text = readFile ./${name}.sh;
+    meta.mainProgram = name;
   };
 
   mkMonitorDomainService =
@@ -44,7 +45,7 @@ let
         Type = "oneshot";
         User = "nobody";
         Group = "nogroup";
-        ExecStart = "${pkgs.bash}/bin/bash ${check-domain}/bin/check-domain ${escapedDomain} ${escapedTopic}";
+        ExecStart = "${getExe check-domain} ${escapedDomain} ${escapedTopic}";
         Restart = "on-failure";
         RestartSec = "300s";
       };
@@ -53,6 +54,7 @@ let
   inherit (lib)
     escapeShellArg
     foldl'
+    getExe
     hasPrefix
     mkDefault
     mkEnableOption