Merge remote-tracking branch 'upstream/master' into HEAD

2018-01-01 15:09:55 +01:00
parent e92a133238 4d917639fb
commit 1869e7e5b0
31 changed files with 408 additions and 154 deletions
@@ -31,6 +31,8 @@ let
      ${mkBindSockets cfg.bindUISocket}
        .include "$CONFDIR/worker-controller.inc"
      }
+
+      ${cfg.extraConfig}
   '';

 in
@@ -79,6 +81,15 @@ in
        '';
      };

+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra configuration to add at the end of the rspamd configuration
+          file.
+        '';
+      };
+
      user = mkOption {
        type = types.string;
        default = "rspamd";