Loading nixos/modules/services/networking/openvpn.nix +3 −4 Original line number Diff line number Diff line Loading @@ -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"; }; Loading @@ -102,6 +102,7 @@ in ###### interface options = { services.openvpn.package = lib.mkPackageOption pkgs "openvpn" { }; services.openvpn.servers = mkOption { default = { }; Loading Loading @@ -164,8 +165,6 @@ in ''; }; package = lib.mkPackageOption pkgs "openvpn" { }; up = mkOption { default = ""; type = types.lines; Loading Loading @@ -254,7 +253,7 @@ in )) // restartService; environment.systemPackages = [ openvpn ]; environment.systemPackages = [ cfg.package ]; boot.kernelModules = [ "tun" ]; Loading Loading
nixos/modules/services/networking/openvpn.nix +3 −4 Original line number Diff line number Diff line Loading @@ -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"; }; Loading @@ -102,6 +102,7 @@ in ###### interface options = { services.openvpn.package = lib.mkPackageOption pkgs "openvpn" { }; services.openvpn.servers = mkOption { default = { }; Loading Loading @@ -164,8 +165,6 @@ in ''; }; package = lib.mkPackageOption pkgs "openvpn" { }; up = mkOption { default = ""; type = types.lines; Loading Loading @@ -254,7 +253,7 @@ in )) // restartService; environment.systemPackages = [ openvpn ]; environment.systemPackages = [ cfg.package ]; boot.kernelModules = [ "tun" ]; Loading