Revert "openvpn service: source up/down scripts"

This reverts commit 50ad243.
NixOS · Apr 26, 2017 · bdd89fa · bdd89fa
1 parent 7deb425
commit bdd89fa
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
@@ -28,26 +28,16 @@ let
           fi
         done
 
+        ${cfg.up}
         ${optionalString cfg.updateResolvConf
            "${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf"}
-
-        ${optionalString (cfg.up != "") "source ${userSuppliedUpScript}"}
       '';
 
       downScript = ''
         #! /bin/sh
         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,15 +133,15 @@ 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.
             '';
           };
 
           down = mkOption {
             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.
             '';
           };