sourcehut: use systemd timers instead of cron

diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix
index 8084b62cd4cb61c365aea91a57ea18e4596159cc..7aee9b81c5b72dcc7ecd1aa03ecef2983b92eb95 100644 (file)
--- a/nixos/modules/services/misc/sourcehut/default.nix
+++ b/nixos/modules/services/misc/sourcehut/default.nix
@@ -471,8 +471,6 @@ in
     services.postgresql.enable = mkOverride 999 true;
     # Mail server
     services.postfix.enable = mkOverride 999 true;
-    # Cron daemon
-    services.cron.enable = mkOverride 999 true;
     # Redis server
     services.redis.enable = mkOverride 999 true;
     services.redis.bind = mkOverride 999 "127.0.0.1";

diff --git a/nixos/modules/services/misc/sourcehut/git.nix b/nixos/modules/services/misc/sourcehut/git.nix
index 0936a7a5767d89de3530c85061972753440356e8..f1dd133bc9e80d1ed2cf6912c69aa0192e030020 100644 (file)
--- a/nixos/modules/services/misc/sourcehut/git.nix
+++ b/nixos/modules/services/misc/sourcehut/git.nix
@@ -82,7 +82,6 @@ in
     };
 
     services = {
-      cron.systemCronJobs = [ "*/20 * * * * ${cfg.python}/bin/gitsrht-periodic" ];
       fcgiwrap.enable = true;
 
       openssh.authorizedKeysCommand = ''/etc/ssh/gitsrht-dispatch "%u" "%h" "%t" "%k"'';
@@ -117,7 +116,7 @@ in
         gitsrht = import ./service.nix { inherit config pkgs lib; } scfg drv iniKey {
           after = [ "redis.service" "postgresql.service" "network.target" ];
           requires = [ "redis.service" "postgresql.service" ];
-          wantedBy = [ "multi-user.target" ];
+          wantedBy = [ "gitsrht.target" ];
 
           # Needs internally to create repos at the very least
           path = [ pkgs.git ];
@@ -126,6 +125,17 @@ in
           serviceConfig.ExecStart = "${cfg.python}/bin/gunicorn ${drv.pname}.app:app -b ${cfg.address}:${toString port}";
         };
 
+        gitsrht-periodic = import ./service.nix { inherit config pkgs lib; } scfg drv iniKey {
+          after = [ "gitsrht.service" ];
+          requires = [ "gitsrht.service" ];
+
+          description = "git.sr.ht periodic service";
+
+          serviceConfig.Type = mkForce "oneshot";
+          serviceConfig.Restart = mkForce "no";
+          serviceConfig.ExecStart = "${cfg.python}/bin/gitsrht-periodic";
+        };
+
         gitsrht-webhooks = {
           after = [ "postgresql.service" "network.target" ];
           requires = [ "postgresql.service" ];
@@ -143,6 +153,17 @@ in
       };
     };
 
+    systemd.timers = {
+      gitsrht-periodic = {
+        description = "gitsrht periodic timer";
+        wantedBy = [ "timers.target" ];
+        timerConfig = {
+          OnCalendar = "20min";
+          Persistent = true;
+        };
+      };
+    };
+
     services.sourcehut.settings = {
       # The authorized keys hook uses this to dispatch to various handlers
       # The format is a program to exec into as the key, and the user to match as the

diff --git a/nixos/modules/services/misc/sourcehut/hg.nix b/nixos/modules/services/misc/sourcehut/hg.nix
index 6481962ac33be84bdf0b286c0b2ab5e4640ea842..eb2a3ab18e297c18e03c531ba086d8a759bc70a5 100644 (file)
--- a/nixos/modules/services/misc/sourcehut/hg.nix
+++ b/nixos/modules/services/misc/sourcehut/hg.nix
@@ -78,9 +78,6 @@ in
     };
 
     services = {
-      cron.systemCronJobs = [ "*/20 * * * * ${cfg.python}/bin/hgsrht-periodic" ]
-        ++ optional cloneBundles "0 * * * * ${cfg.python}/bin/hgsrht-clonebundles";
-
       openssh.authorizedKeysCommand = ''/etc/ssh/hgsrht-dispatch "%u" "%h" "%t" "%k"'';
       openssh.authorizedKeysCommandUser = "root";
       openssh.extraConfig = ''
@@ -109,15 +106,59 @@ in
         "d ${cfg.settings."${iniKey}".repos} 2755 ${user} ${user} -"
       ];
 
-      services.hgsrht = import ./service.nix { inherit config pkgs lib; } scfg drv iniKey {
-        after = [ "redis.service" "postgresql.service" "network.target" ];
-        requires = [ "redis.service" "postgresql.service" ];
-        wantedBy = [ "multi-user.target" ];
+      services = {
+        hgsrht = import ./service.nix { inherit config pkgs lib; } scfg drv iniKey {
+          after = [ "redis.service" "postgresql.service" "network.target" ];
+          requires = [ "redis.service" "postgresql.service" ];
+          wantedBy = [ "multi-user.target" ];
+
+          path = [ pkgs.mercurial ];
+          description = "hg.sr.ht website service";
+
+          serviceConfig.ExecStart = "${cfg.python}/bin/gunicorn ${drv.pname}.app:app -b ${cfg.address}:${toString port}";
+        };
+
+        hgsrht-periodic = import ./service.nix { inherit config pkgs lib; } scfg drv iniKey {
+          after = [ "hgsrht.service" ];
+          requires = [ "hgsrht.service" ];
+
+          description = "hg.sr.ht periodic service";
+
+          serviceConfig.Type = mkForce "oneshot";
+          serviceConfig.Restart = mkForce "no";
+          serviceConfig.ExecStart = "${cfg.python}/bin/hgsrht-periodic";
+        };
+
+        hgsrht-clonebundles = import ./service.nix { inherit config pkgs lib; } scfg drv iniKey {
+          after = [ "hgsrht.service" ];
+          requires = [ "hgsrht.service" ];
+
+          description = "hg.sr.ht periodic service";
 
-        path = [ pkgs.mercurial ];
-        description = "hg.sr.ht website service";
+          serviceConfig.Type = mkForce "oneshot";
+          serviceConfig.Restart = mkForce "no";
+          serviceConfig.ExecStart = "${cfg.python}/bin/hgsrht-periodic";
+        };
+      };
+    };
 
-        serviceConfig.ExecStart = "${cfg.python}/bin/gunicorn ${drv.pname}.app:app -b ${cfg.address}:${toString port}";
+    systemd.timers = {
+      hgsrht-periodic = {
+        description = "hgsrht periodic timer";
+        wantedBy = [ "timers.target" ];
+        timerConfig = {
+          OnCalendar = "20min";
+          Persistent = true;
+        };
+      };
+      hgsrht-clonebundles = {
+        description = "hgsrht daily timer";
+        wantedBy = [ "timers.target" ];
+        timerConfig = {
+          OnCalendar = "daily";
+          Persistent = true;
+          AccuracySec = "1h";
+        };
       };
     };
 

diff --git a/nixos/modules/services/misc/sourcehut/meta.nix b/nixos/modules/services/misc/sourcehut/meta.nix
index 658fe0ee5c214d78e95791b93d2e449c150c015b..b065c3e5b362a9ce60a2018789aaaacc5536d4f0 100644 (file)
--- a/nixos/modules/services/misc/sourcehut/meta.nix
+++ b/nixos/modules/services/misc/sourcehut/meta.nix
@@ -62,7 +62,6 @@ in
       };
     };
 
-    services.cron.systemCronJobs = [ "0 0 * * * ${cfg.python}/bin/metasrht-daily" ];
     services.postgresql = {
       authentication = ''
         local ${database} ${user} trust
@@ -112,7 +111,7 @@ in
         metasrht-api = import ./service.nix { inherit config pkgs lib; } scfg drv iniKey {
           after = [ "postgresql.service" "network.target" ];
           requires = [ "postgresql.service" ];
-          wantedBy = [ "multi-user.target" ];
+          wantedBy = [ "metasrht.service" ];
 
           description = "meta.sr.ht api service";
 
@@ -121,10 +120,21 @@ in
           serviceConfig.ExecStart = "${pkgs.sourcehut.metasrht}/bin/metasrht-api -b :${toString (port + 100)}";
         };
 
+        metasrht-daily = import ./service.nix { inherit config pkgs lib; } scfg drv iniKey {
+          after = [ "metasrht.service" ];
+          requires = [ "metasrht.service" ];
+
+          description = "meta.sr.ht daily service";
+
+          serviceConfig.Type = mkForce "oneshot";
+          serviceConfig.Restart = mkForce "no";
+          serviceConfig.ExecStart = "${cfg.python}/bin/metasrht-daily";
+        };
+
         metasrht-webhooks = {
           after = [ "postgresql.service" "network.target" ];
           requires = [ "postgresql.service" ];
-          wantedBy = [ "multi-user.target" ];
+          wantedBy = [ "multi-user.service" ];
 
           description = "meta.sr.ht webhooks service";
           serviceConfig = {
@@ -138,6 +148,18 @@ in
       };
     };
 
+    systemd.timers = {
+      metasrht-daily = {
+        description = "metasrht daily timer";
+        wantedBy = [ "timers.target" ];
+        timerConfig = {
+          OnCalendar = "daily";
+          Persistent = true;
+          AccuracySec = "1h";
+        };
+      };
+    };
+
     services.nginx.virtualHosts."meta.${cfg.originBase}" = {
       forceSSL = true;
       locations."/".proxyPass = "http://${cfg.address}:${toString port}";

diff --git a/nixos/modules/services/misc/sourcehut/service.nix b/nixos/modules/services/misc/sourcehut/service.nix
index 8d80361b2a5ac814c8cf1c05cbb8f1e721186e14..444f14cc1714d685c8ef87b7dd5971e009261e6c 100644 (file)
--- a/nixos/modules/services/misc/sourcehut/service.nix
+++ b/nixos/modules/services/misc/sourcehut/service.nix
@@ -18,6 +18,7 @@ with serviceCfg; with lib; mkMerge [
     User = user;
     Group = user;
     Restart = "always";
+    RestartSec = "2min";
     WorkingDirectory = statePath;
     StateDirectory = [ "sourcehut/${serviceDrv.pname}" ];
   };