colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "openvpn service: source up/down scripts"

Browse Source 
This reverts commit 50ad243f78.
This commit is contained in:
Graham Christensen 2017-04-26 12:32:59 -04:00
parent 7deb425286
commit bdd89faebb
No known key found for this signature in database
GPG Key ID: 06121D366FE9435C
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/networking/openvpn.nix
View File

@ -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.
'';
};