From adc368d2fc7dd74beb8486ff72880ed0212abb0d Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Mon, 17 May 2021 21:00:57 +0800 Subject: Only include ipsecTools if using ipsec --- nixos/modules/virtualisation/openvswitch.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index c6a3ceddc3e..a351974b481 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -66,9 +66,7 @@ in { }; in (mkMerge [{ - - environment.systemPackages = [ cfg.package pkgs.ipsecTools ]; - + environment.systemPackages = [ cfg.package ]; boot.kernelModules = [ "tun" "openvswitch" ]; boot.extraModulePackages = [ cfg.package ]; @@ -146,6 +144,8 @@ in { } (mkIf (cfg.ipsec && (versionOlder cfg.package.version "2.6.0")) { + environment.systemPackages = [ pkgs.ipsecTools ]; + services.racoon.enable = true; services.racoon.configPath = "${runDir}/ipsec/etc/racoon/racoon.conf"; -- cgit 1.4.1 From 80830373f08c7affe08b2806bee2f7fc5d85e9fc Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Mon, 17 May 2021 21:11:07 +0800 Subject: Update openvswitch.nix --- nixos/modules/virtualisation/openvswitch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index a351974b481..ccf32641df6 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -145,7 +145,7 @@ in { } (mkIf (cfg.ipsec && (versionOlder cfg.package.version "2.6.0")) { environment.systemPackages = [ pkgs.ipsecTools ]; - + services.racoon.enable = true; services.racoon.configPath = "${runDir}/ipsec/etc/racoon/racoon.conf"; -- cgit 1.4.1