Merge remote-tracking branch 'ni/master'

krebs/3modules/systemd.nix

@@ -5,18 +5,18 @@
     default = {};
     type = lib.types.attrsOf (lib.types.submodule {
       options = {
-        ifCredentialsChange = lib.mkOption {
-          default = "restart";
+        restartIfCredentialsChange = lib.mkOption {
+          # Enabling this by default only makes sense here as the user already
+          # bothered to write down krebs.systemd.services.* = {}.  If this
+          # functionality gets upstreamed to systemd.services, restarting
+          # should be disabled by default.
+          default = true;
           description = ''
-            Whether to reload or restart the service whenever any its
-            credentials change.  Only credentials with an absolute path in
-            LoadCredential= are supported.
+            Whether to restart the service whenever any of its credentials
+            change.  Only credentials with an absolute path in LoadCredential=
+            are supported.
           '';
-          type = lib.types.enum [
-            "reload"
-            "restart"
-            null
-          ];
+          type = lib.types.bool;
         };
       };
     });
@@ -40,7 +40,7 @@
       lib.nameValuePair "trigger-${lib.systemd.encodeName serviceName}" {
         serviceConfig = {
           Type = "oneshot";
-          ExecStart = "${pkgs.systemd}/bin/systemctl ${cfg.ifCredentialsChange} ${lib.shell.escape serviceName}";
+          ExecStart = "${pkgs.systemd}/bin/systemctl restart ${lib.shell.escape serviceName}";
         };
       }
     ) config.krebs.systemd.services;

krebs/5pkgs/simple/ircaids/default.nix

@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "ircaids";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = pkgs.fetchgit {
     url = "https://cgit.krebsco.de/ircaids";
     rev = "refs/tags/${version}";
-    sha256 = "049ln54llfrn99q0pzwlb7iaz4igd4f3n4rb6mpc9irsy32bv3qg";
+    sha256 = "128ryfl0prpc1789hhqw2mq16zy3jd82a24k6hkw7nj71hifzr3a";
   };
 
   buildPhase = null;