mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
systemd-resolved: fix case when dnsmasq is used as local resolver
fixes #25706
This commit is contained in:
parent
5604dbe878
commit
859267f627
|
@ -222,13 +222,11 @@ in
|
||||||
'' + cfg.extraResolvconfConf + ''
|
'' + cfg.extraResolvconfConf + ''
|
||||||
'';
|
'';
|
||||||
|
|
||||||
} // (optionalAttrs config.services.resolved.enable (
|
} // optionalAttrs config.services.resolved.enable {
|
||||||
if dnsmasqResolve then {
|
"resolv.conf".source = "/run/systemd/resolve/resolv.conf";
|
||||||
"dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
|
} // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) {
|
||||||
} else {
|
"dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
|
||||||
"resolv.conf".source = "/run/systemd/resolve/resolv.conf";
|
};
|
||||||
}
|
|
||||||
));
|
|
||||||
|
|
||||||
networking.proxy.envVars =
|
networking.proxy.envVars =
|
||||||
optionalAttrs (cfg.proxy.default != null) {
|
optionalAttrs (cfg.proxy.default != null) {
|
||||||
|
|
Loading…
Reference in a new issue