diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-26 22:01:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-26 22:01:26 +0000 |
| commit | 405409fce7d99246d7a5fd465c5f179bdc7bb3c9 (patch) | |
| tree | 42e27c1b51502e592d9ee40af03e8818329487e6 /nixos | |
| parent | e7e072d05a0cfafde00828ce589756444f7d39d8 (diff) | |
| parent | 54767589c73ccc1a590d86a68e0551e91602f1cd (diff) | |
| download | nixlib-405409fce7d99246d7a5fd465c5f179bdc7bb3c9.tar nixlib-405409fce7d99246d7a5fd465c5f179bdc7bb3c9.tar.gz nixlib-405409fce7d99246d7a5fd465c5f179bdc7bb3c9.tar.bz2 nixlib-405409fce7d99246d7a5fd465c5f179bdc7bb3c9.tar.lz nixlib-405409fce7d99246d7a5fd465c5f179bdc7bb3c9.tar.xz nixlib-405409fce7d99246d7a5fd465c5f179bdc7bb3c9.tar.zst nixlib-405409fce7d99246d7a5fd465c5f179bdc7bb3c9.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/openvpn.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 78d312af978b..9a5866f2afd4 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -14,7 +14,6 @@ let path = makeBinPath (getAttr "openvpn-${name}" config.systemd.services).path; upScript = '' - #! /bin/sh export PATH=${path} # For convenience in client scripts, extract the remote domain @@ -34,7 +33,6 @@ let ''; downScript = '' - #! /bin/sh export PATH=${path} ${optionalString cfg.updateResolvConf "${pkgs.update-resolv-conf}/libexec/openvpn/update-resolv-conf"} @@ -47,9 +45,9 @@ let ${optionalString (cfg.up != "" || cfg.down != "" || cfg.updateResolvConf) "script-security 2"} ${cfg.config} ${optionalString (cfg.up != "" || cfg.updateResolvConf) - "up ${pkgs.writeScript "openvpn-${name}-up" upScript}"} + "up ${pkgs.writeShellScript "openvpn-${name}-up" upScript}"} ${optionalString (cfg.down != "" || cfg.updateResolvConf) - "down ${pkgs.writeScript "openvpn-${name}-down" downScript}"} + "down ${pkgs.writeShellScript "openvpn-${name}-down" downScript}"} ${optionalString (cfg.authUserPass != null) "auth-user-pass ${pkgs.writeText "openvpn-credentials-${name}" '' ${cfg.authUserPass.username} |