diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2019-06-10 18:31:14 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2019-06-10 20:20:47 +0300 |
| commit | 493bb6035a88273250b48af69387fc5a7a372413 (patch) | |
| tree | f65b76f05629342f08b438b2e2b9335b8d43cba0 /nixos/modules/services/networking/networkmanager.nix | |
| parent | 5be5991c80f695e26dd97c12774bbd0e3d6e2551 (diff) | |
| download | nixlib-493bb6035a88273250b48af69387fc5a7a372413.tar nixlib-493bb6035a88273250b48af69387fc5a7a372413.tar.gz nixlib-493bb6035a88273250b48af69387fc5a7a372413.tar.bz2 nixlib-493bb6035a88273250b48af69387fc5a7a372413.tar.lz nixlib-493bb6035a88273250b48af69387fc5a7a372413.tar.xz nixlib-493bb6035a88273250b48af69387fc5a7a372413.tar.zst nixlib-493bb6035a88273250b48af69387fc5a7a372413.zip | |
networkmanager service: install strongswan configuration file only if enabled
Diffstat (limited to 'nixos/modules/services/networking/networkmanager.nix')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 2dc3681f2b46..76fdcd08d8ab 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -421,9 +421,6 @@ in { { source = "${networkmanager-l2tp}/lib/NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name"; } - { source = "${networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name"; - target = "NetworkManager/VPN/nm-strongswan-service.name"; - } { source = "${networkmanager-iodine}/lib/NetworkManager/VPN/nm-iodine-service.name"; target = "NetworkManager/VPN/nm-iodine-service.name"; } @@ -436,11 +433,15 @@ in { target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; mode = "0544"; }) cfg.dispatcherScripts - ++ optional (dynamicHostsEnabled) + ++ optional dynamicHostsEnabled { target = "NetworkManager/dnsmasq.d/dyndns.conf"; text = concatMapStrings (n: '' hostsdir=/run/NetworkManager/hostsdirs/${n} '') (attrNames cfg.dynamicHosts.hostsDirs); + } + ++ optional cfg.enableStrongSwan + { source = "${pkgs.networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name"; + target = "NetworkManager/VPN/nm-strongswan-service.name"; }; environment.systemPackages = cfg.packages; |