Merge remote-tracking branch 'origin/master' into staging

2014-09-18 22:28:35 +02:00
parent f32e964cc4 aa67e95bb5
commit 91ec6e0d90
340 changed files with 5242 additions and 1514 deletions
@@ -230,6 +230,15 @@ in rec {
      '';
    };

+    reload = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Shell commands executed when the service's main process
+        is reloaded.
+      '';
+    };
+
    preStop = mkOption {
      type = types.lines;
      default = "";
@@ -246,6 +246,12 @@ let
              ${config.postStart}
            '';
          })
+        (mkIf (config.reload != "")
+          { serviceConfig.ExecReload = makeJobScript "${name}-reload" ''
+              #! ${pkgs.stdenv.shell} -e
+              ${config.reload}
+            '';
+          })
        (mkIf (config.preStop != "")
          { serviceConfig.ExecStop = makeJobScript "${name}-pre-stop" ''
              #! ${pkgs.stdenv.shell} -e