about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2016-05-16 20:27:56 +0800
committerPeter Hoeg <peter@hoeg.com>2019-09-22 13:33:43 +0800
commit1c7aaf227ce8cd0613050a12bcdad37bea61e678 (patch)
treecd831d73f2198d554d1d4f5f8a24505e74c532ce
parentd484f2b7fc0834a068e8ace851faa449a03963f5 (diff)
downloadnixlib-1c7aaf227ce8cd0613050a12bcdad37bea61e678.tar
nixlib-1c7aaf227ce8cd0613050a12bcdad37bea61e678.tar.gz
nixlib-1c7aaf227ce8cd0613050a12bcdad37bea61e678.tar.bz2
nixlib-1c7aaf227ce8cd0613050a12bcdad37bea61e678.tar.lz
nixlib-1c7aaf227ce8cd0613050a12bcdad37bea61e678.tar.xz
nixlib-1c7aaf227ce8cd0613050a12bcdad37bea61e678.tar.zst
nixlib-1c7aaf227ce8cd0613050a12bcdad37bea61e678.zip
nixos/networkmanager: tiny cleanups
These are the leftovers of an older PR.

a. Send messages to auditd if auditing is enabled.
b. Add missing dbus configuration if dnsmasq is used for DNS
-rw-r--r--nixos/modules/services/networking/networkmanager.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index db4d0e328e2d..887c89ddf3ab 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;
   };