summary refs log tree commit diff
path: root/nixos/modules/services/networking/networkmanager.nix
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2017-10-31 20:14:00 +0900
committerMatthieu Coudron <mattator@gmail.com>2018-02-07 13:21:49 +0900
commitfe4f4de1c92714aa9a2add7ffb3ca83a861d6d4e (patch)
tree3ff95b602076c9944d4f995bf1f7525e360349fe /nixos/modules/services/networking/networkmanager.nix
parent11a9e1c3c0b2595ea37b8812736427ffb32a0787 (diff)
downloadnixpkgs-fe4f4de1c92714aa9a2add7ffb3ca83a861d6d4e.tar
nixpkgs-fe4f4de1c92714aa9a2add7ffb3ca83a861d6d4e.tar.gz
nixpkgs-fe4f4de1c92714aa9a2add7ffb3ca83a861d6d4e.tar.bz2
nixpkgs-fe4f4de1c92714aa9a2add7ffb3ca83a861d6d4e.tar.lz
nixpkgs-fe4f4de1c92714aa9a2add7ffb3ca83a861d6d4e.tar.xz
nixpkgs-fe4f4de1c92714aa9a2add7ffb3ca83a861d6d4e.tar.zst
nixpkgs-fe4f4de1c92714aa9a2add7ffb3ca83a861d6d4e.zip
strongswan module: make it work with ipsec l2tp
l2tp saves its secrets into /etc/ipsec.d but strongswan would not read
them. l2tp checks for /etc/ipsec.secrets includes /etc/ipsec.d and if
not tries to write into it.

Solution:
Have the strongswan module create /etc/ipsec.d and /etc/ipsec.secrets
when networkmanager_l2tp is installed.
Include /etc/ipsec.secrets in
/nix/store/hash-strongswan/etc/ipsec.secrets so that it can find l2tp
secrets.

Also when the ppp 'nopeerdns' option is used, the DNS resolver tries to
write into an alternate file /etc/ppp/resolv.conf. This fails when
/etc/ppp does not exist so the module creates it by default.
Diffstat (limited to 'nixos/modules/services/networking/networkmanager.nix')
-rw-r--r--nixos/modules/services/networking/networkmanager.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 62afbf32c2f..a5ca6cc74cf 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -335,6 +335,7 @@ in {
 
       preStart = ''
         mkdir -m 700 -p /etc/NetworkManager/system-connections
+        mkdir -m 700 -p /etc/ipsec.d
         mkdir -m 755 -p ${stateDirs}
       '';
     };