Unverified Commit 2e895348 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

nixos/services.openvpn: add package option (#354301)

parents cd67a585 453a7b57
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ let

  cfg = config.services.openvpn;

  inherit (pkgs) openvpn;

  makeOpenVPNJob =
    cfg: name:
    let
@@ -77,7 +75,7 @@ let
        pkgs.net-tools
      ];

      serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";
      serviceConfig.ExecStart = "@${cfg.package}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";
      serviceConfig.Restart = "always";
      serviceConfig.Type = "notify";
    };
@@ -166,6 +164,8 @@ in
              '';
            };

            package = lib.mkPackageOption pkgs "openvpn" { };

            up = mkOption {
              default = "";
              type = types.lines;