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:
@@ -75,7 +75,7 @@ let
|
|||||||
pkgs.net-tools
|
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.Restart = "always";
|
||||||
serviceConfig.Type = "notify";
|
serviceConfig.Type = "notify";
|
||||||
};
|
};
|
||||||
@@ -102,6 +102,7 @@ in
|
|||||||
###### interface
|
###### interface
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
services.openvpn.package = lib.mkPackageOption pkgs "openvpn" { };
|
||||||
|
|
||||||
services.openvpn.servers = mkOption {
|
services.openvpn.servers = mkOption {
|
||||||
default = { };
|
default = { };
|
||||||
@@ -164,8 +165,6 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
package = lib.mkPackageOption pkgs "openvpn" { };
|
|
||||||
|
|
||||||
up = mkOption {
|
up = mkOption {
|
||||||
default = "";
|
default = "";
|
||||||
type = types.lines;
|
type = types.lines;
|
||||||
@@ -254,7 +253,7 @@ in
|
|||||||
))
|
))
|
||||||
// restartService;
|
// restartService;
|
||||||
|
|
||||||
environment.systemPackages = [ openvpn ];
|
environment.systemPackages = [ cfg.package ];
|
||||||
|
|
||||||
boot.kernelModules = [ "tun" ];
|
boot.kernelModules = [ "tun" ];
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user