Merge branch 'master' into staging

2019-09-02 23:25:24 +02:00
parent b291f2a995 12ae04518b
commit f21211ebfe
277 changed files with 4766 additions and 1895 deletions
@@ -155,7 +155,7 @@ in

      config = mkOption {
        default = "FQDN=1";
-        type = types.string;
+        type = types.lines;
        description = ''
          Config options that you would like in logcheck.conf.
        '';