diff options
| author | Peter Hoeg <peter@hoeg.com> | 2019-09-23 10:16:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 10:16:32 +0800 |
| commit | 423eb169130ca390fee2f88ee0effe3b01a5caa2 (patch) | |
| tree | 90bb992977574cc9a3e0416576ad8ce762482624 /nixos | |
| parent | ad22b9084df5c8f436f1b7b17e80e21e24d8ab4b (diff) | |
| parent | 1c7aaf227ce8cd0613050a12bcdad37bea61e678 (diff) | |
Merge pull request #15560 from peterhoeg/nm_dnsdhcp
nixos/networkmanager: tiny cleanups
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index db4d0e328e2..887c89ddf3a 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -27,6 +27,7 @@ let [logging] level=${cfg.logLevel} + audit=${lib.boolToString config.security.audit.enable} [connection] ipv6.ip6-privacy=2 @@ -508,8 +509,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; }; |