Merge pull request #123364 from edude03/patch-7
This commit is contained in:
commit
6e2204ea32
|
@ -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";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue