c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

nixos/openvpn: fix eval (#456734)

Browse source
This commit is contained in:
Sandro 2025-10-29 15:15:26 +00:00 • committed by GitHub
commit 185831893d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/services/networking/openvpn.nix
View file

@ -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" ];