diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-04-26 12:32:59 -0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-04-26 12:32:59 -0400 |
| commit | bdd89faebb2c3d7c291776643de65efbc5172b44 (patch) | |
| tree | 10d91603bd04c8ca570a4b489e5bdb2a29dbd5a5 /nixos/modules/services/networking/openvpn.nix | |
| parent | 7deb425286c74837946917888ed74a23de1f9f68 (diff) | |
| download | nixpkgs-bdd89faebb2c3d7c291776643de65efbc5172b44.tar nixpkgs-bdd89faebb2c3d7c291776643de65efbc5172b44.tar.gz nixpkgs-bdd89faebb2c3d7c291776643de65efbc5172b44.tar.bz2 nixpkgs-bdd89faebb2c3d7c291776643de65efbc5172b44.tar.lz nixpkgs-bdd89faebb2c3d7c291776643de65efbc5172b44.tar.xz nixpkgs-bdd89faebb2c3d7c291776643de65efbc5172b44.tar.zst nixpkgs-bdd89faebb2c3d7c291776643de65efbc5172b44.zip | |
Revert "openvpn service: source up/down scripts"
This reverts commit 50ad243f7802c09788441fb0099626387fddb2db.
Diffstat (limited to 'nixos/modules/services/networking/openvpn.nix')
| -rw-r--r-- | nixos/modules/services/networking/openvpn.nix | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 1e99a2b4450..3fbf5a9f022 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -28,10 +28,9 @@ let fi done + ${cfg.up} ${optionalString cfg.updateResolvConf "${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf"} - - ${optionalString (cfg.up != "") "source ${userSuppliedUpScript}"} ''; downScript = '' @@ -39,15 +38,6 @@ let export PATH=${path} ${optionalString cfg.updateResolvConf "${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf"} - - ${optionalString (cfg.down != "") "source ${userSuppliedDownScript}"} - ''; - - userSuppliedUpScript = pkgs.writeScript "openvpn-${name}-userSuppliedUpScript" '' - ${cfg.up} - ''; - - userSuppliedDownScript = pkgs.writeScript "openvpn-${name}-userSuppliedDownScript" '' ${cfg.down} ''; @@ -143,7 +133,7 @@ in default = ""; type = types.lines; description = '' - Shell script sourced by NixOS generated script when the instance is starting. + Shell commands executed when the instance is starting. ''; }; @@ -151,7 +141,7 @@ in default = ""; type = types.lines; description = '' - Shell script sourced by NixOS generated script when the instance is shutting down. + Shell commands executed when the instance is shutting down. ''; }; |