diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-03-30 23:05:42 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-03-30 23:05:42 +0300 |
| commit | 7c03829024d7b51be48f759dd1e08be5597065c0 (patch) | |
| tree | cbd4979f23611a8c8996b1bc5ec7a8a175f6d4af /nixos | |
| parent | b77aec818a128a32447578ca618ee4f4d15d6d06 (diff) | |
| parent | 16f047a60f93b221bae256b6331e632c82fc5b7b (diff) | |
| download | nixlib-7c03829024d7b51be48f759dd1e08be5597065c0.tar nixlib-7c03829024d7b51be48f759dd1e08be5597065c0.tar.gz nixlib-7c03829024d7b51be48f759dd1e08be5597065c0.tar.bz2 nixlib-7c03829024d7b51be48f759dd1e08be5597065c0.tar.lz nixlib-7c03829024d7b51be48f759dd1e08be5597065c0.tar.xz nixlib-7c03829024d7b51be48f759dd1e08be5597065c0.tar.zst nixlib-7c03829024d7b51be48f759dd1e08be5597065c0.zip | |
Merge pull request #7060 from abbradar/nm-l2tp
Support L2TP in NetworkManager
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 3a64d3f09e02..f00c5d1f701d 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -183,6 +183,9 @@ in { { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; target = "NetworkManager/VPN/nm-pptp-service.name"; } + { source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; + target = "NetworkManager/VPN/nm-l2tp-service.name"; + } ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; @@ -197,6 +200,7 @@ in { networkmanager_vpnc networkmanager_openconnect networkmanager_pptp + networkmanager_l2tp modemmanager ]; @@ -240,6 +244,7 @@ in { networkmanager_vpnc networkmanager_openconnect networkmanager_pptp + networkmanager_l2tp modemmanager ]; |