public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #131792 from hax404/21.05-fix-openvswitch

Browse Source 
[21.05] nixos/openvswitch: Only include ipsecTools if using ipsec
This commit is contained in:
Sandro 2021-07-28 21:28:39 +00:00 committed by GitHub
commit 3aeb81fd62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/virtualisation/openvswitch.nix
View File

@ -66,9 +66,7 @@ in {
}; };
in (mkMerge [{ in (mkMerge [{
environment.systemPackages = [ cfg.package ];
environment.systemPackages = [ cfg.package pkgs.ipsecTools ];
boot.kernelModules = [ "tun" "openvswitch" ]; boot.kernelModules = [ "tun" "openvswitch" ];
boot.extraModulePackages = [ cfg.package ]; boot.extraModulePackages = [ cfg.package ];
@ -146,6 +144,8 @@ in {
} }
(mkIf (cfg.ipsec && (versionOlder cfg.package.version "2.6.0")) { (mkIf (cfg.ipsec && (versionOlder cfg.package.version "2.6.0")) {
environment.systemPackages = [ pkgs.ipsecTools ];
services.racoon.enable = true; services.racoon.enable = true;
services.racoon.configPath = "${runDir}/ipsec/etc/racoon/racoon.conf"; services.racoon.configPath = "${runDir}/ipsec/etc/racoon/racoon.conf";