mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-11-10 09:43:30 +01:00
nixos/openvpn: fix eval
One usage of pkgs.openvpn was forgotten in the last PR and package should be one more up. Upsi...
This commit is contained in:
parent
2d5a7306d8
commit
0b27d9b07a
|
|
@ -75,7 +75,7 @@ let
|
|||
pkgs.net-tools
|
||||
];
|
||||
|
||||
serviceConfig.ExecStart = "@${cfg.package}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";
|
||||
serviceConfig.ExecStart = "@${config.services.openvpn.package}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";
|
||||
serviceConfig.Restart = "always";
|
||||
serviceConfig.Type = "notify";
|
||||
};
|
||||
|
|
@ -102,6 +102,7 @@ in
|
|||
###### interface
|
||||
|
||||
options = {
|
||||
services.openvpn.package = lib.mkPackageOption pkgs "openvpn" { };
|
||||
|
||||
services.openvpn.servers = mkOption {
|
||||
default = { };
|
||||
|
|
@ -164,8 +165,6 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
package = lib.mkPackageOption pkgs "openvpn" { };
|
||||
|
||||
up = mkOption {
|
||||
default = "";
|
||||
type = types.lines;
|
||||
|
|
@ -254,7 +253,7 @@ in
|
|||
))
|
||||
// restartService;
|
||||
|
||||
environment.systemPackages = [ openvpn ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
boot.kernelModules = [ "tun" ];
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue