mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
Code Issues Wiki Activity

networkmanager: dns and extraConfig

Browse source
This commit is contained in:
Peter Hoeg 2017-08-26 10:21:55 +08:00
parent 5f29e9fdbf
commit 0dd25e585f
1 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
nixos/modules/services/networking/networkmanager.nix
View file

@ -9,17 +9,17 @@ let
# /var/lib/misc is for dnsmasq.leases. # /var/lib/misc is for dnsmasq.leases.
stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc";
dns = useDnsmasq = cfg.dns == "dnsmasq";
if cfg.useDnsmasq then "dnsmasq" useResolved = cfg.dns == "systemd-resolved";
else if config.services.resolved.enable then "systemd-resolved"
else if config.services.unbound.enable then "unbound" rcman = if useResolved then "unmanaged" else "resolvconf";
else "default";
configFile = writeText "NetworkManager.conf" '' configFile = writeText "NetworkManager.conf" ''
[main] [main]
plugins=keyfile plugins=keyfile
dhcp=${cfg.dhcp} dhcp=${cfg.dhcp}
dns=${dns} dns=${cfg.dns}
rc-manager=${rcman}
[keyfile] [keyfile]
${optionalString (cfg.unmanaged != []) ${optionalString (cfg.unmanaged != [])
@ -32,6 +32,8 @@ let
ipv6.ip6-privacy=2 ipv6.ip6-privacy=2
ethernet.cloned-mac-address=${cfg.ethernet.macAddress} ethernet.cloned-mac-address=${cfg.ethernet.macAddress}
wifi.cloned-mac-address=${cfg.wifi.macAddress} wifi.cloned-mac-address=${cfg.wifi.macAddress}
${cfg.extraConfig}
''; '';
/* /*
@ -144,6 +146,17 @@ in {
apply = list: (attrValues cfg.basePackages) ++ list; apply = list: (attrValues cfg.basePackages) ++ list;
}; };
dns = mkOption {
type = types.enum [ "default" "dnsmasq" "systemd-resolved" ];
default = "default";
description = ''
Enable NetworkManager's integration with other DNS resolvers. NetworkManager can run
dnsmasq as a local caching nameserver or systemd-resolved, using a "split DNS"
configuration if you are connected to a VPN, and then update
resolv.conf to point to the local nameserver.
'';
};
dhcp = mkOption { dhcp = mkOption {
type = types.enum [ "dhclient" "dhcpcd" "internal" ]; type = types.enum [ "dhclient" "dhcpcd" "internal" ];
default = "dhclient"; default = "dhclient";
@ -181,17 +194,6 @@ in {
ethernet.macAddress = macAddressOpt; ethernet.macAddress = macAddressOpt;
wifi.macAddress = macAddressOpt; wifi.macAddress = macAddressOpt;
useDnsmasq = mkOption {
type = types.bool;
default = false;
description = ''
Enable NetworkManager's dnsmasq integration. NetworkManager will run
dnsmasq as a local caching nameserver, using a "split DNS"
configuration if you are connected to a VPN, and then update
resolv.conf to point to the local nameserver.
'';
};
dispatcherScripts = mkOption { dispatcherScripts = mkOption {
type = types.listOf (types.submodule { type = types.listOf (types.submodule {
options = { options = {
@ -216,6 +218,12 @@ in {
A list of scripts which will be executed in response to network events. A list of scripts which will be executed in response to network events.
''; '';
}; };
extraConfig = mkOption {
type = types.lines;
default = "";
description = "Additional configuration added verbatim to the configuration file.";
};
}; };
}; };
@ -289,10 +297,15 @@ in {
group = "networkmanager"; group = "networkmanager";
}]; }];
services.resolved = lib.mkIf useResolved {
enable = true;
};
systemd.packages = cfg.packages; systemd.packages = cfg.packages;
systemd.services."network-manager" = { systemd.services."network-manager" = {
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
wants = lib.mkIf useResolved [ "systemd-resolved.service" ];
restartTriggers = [ configFile ]; restartTriggers = [ configFile ];
preStart = '' preStart = ''