Merge branch 'master' into staging-next

2019-09-24 08:14:34 +02:00
parent 11c2b06dd2 afd04a49ed
commit eab41878ac
185 changed files with 5276 additions and 3825 deletions
@@ -27,6 +27,7 @@ let

    [logging]
    level=${cfg.logLevel}
+    audit=${lib.boolToString config.security.audit.enable}

    [connection]
    ipv6.ip6-privacy=2
@@ -513,8 +514,9 @@ in {

    security.polkit.extraConfig = polkitConf;

-    services.dbus.packages =
-      optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages;
+    services.dbus.packages = cfg.packages
+      ++ optional cfg.enableStrongSwan pkgs.strongswanNM
+      ++ optional (cfg.dns == "dnsmasq") pkgs.dnsmasq;

    services.udev.packages = cfg.packages;
  };