diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-22 13:08:00 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-22 13:14:58 +0200 |
| commit | 27a8cada791d3de1fd1c6992221ab485d9e4a349 (patch) | |
| tree | 29e6065c72436b1ad6e9de6474e563ec183dc551 /pkgs/tools/networking/openvpn | |
| parent | 33b4ab3ac1d2861ea23a82c20ccfbd7a2bb04df3 (diff) | |
| download | nixlib-27a8cada791d3de1fd1c6992221ab485d9e4a349.tar nixlib-27a8cada791d3de1fd1c6992221ab485d9e4a349.tar.gz nixlib-27a8cada791d3de1fd1c6992221ab485d9e4a349.tar.bz2 nixlib-27a8cada791d3de1fd1c6992221ab485d9e4a349.tar.lz nixlib-27a8cada791d3de1fd1c6992221ab485d9e4a349.tar.xz nixlib-27a8cada791d3de1fd1c6992221ab485d9e4a349.tar.zst nixlib-27a8cada791d3de1fd1c6992221ab485d9e4a349.zip | |
openvpn: Add systemd startup notification
This causes OpenVPN services to reach the "active" state when the VPN connection is up (i.e., after OpenVPN prints "Initialization Sequence Completed"). This allows units to be ordered correctly after openvpn-* units, and makes systemctl present a password prompt: $ start openvpn-foo Enter Private Key Password: ************* (I first tried to implement this by calling "systemd-notify --ready" from the "up" script, but systemd-notify is not reliable.)
Diffstat (limited to 'pkgs/tools/networking/openvpn')
| -rw-r--r-- | pkgs/tools/networking/openvpn/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/networking/openvpn/systemd-notify.patch | 22 |
2 files changed, 30 insertions, 2 deletions
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 1717b38a90a9..0ce22b7800ef 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, iproute, lzo, openssl, pam }: +{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "openvpn-2.3.3"; @@ -8,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "04xiwim56sb1vis93k9hhm1s29jdrlq7i2fa07jncnhh653d29gh"; }; - buildInputs = [ iproute lzo openssl pam ]; + patches = optional stdenv.isLinux ./systemd-notify.patch; + + buildInputs = [ iproute lzo openssl pam ] ++ optional stdenv.isLinux systemd; configureFlags = '' --enable-password-save @@ -31,6 +35,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_LDFLAGS = optionalString stdenv.isLinux "-lsystemd-daemon"; # hacky + meta = { description = "A robust and highly flexible tunneling application"; homepage = http://openvpn.net/; diff --git a/pkgs/tools/networking/openvpn/systemd-notify.patch b/pkgs/tools/networking/openvpn/systemd-notify.patch new file mode 100644 index 000000000000..9291f7a46642 --- /dev/null +++ b/pkgs/tools/networking/openvpn/systemd-notify.patch @@ -0,0 +1,22 @@ +diff -ru -x '*~' openvpn-2.3.1-orig/src/openvpn/init.c openvpn-2.3.1/src/openvpn/init.c +--- openvpn-2.3.1-orig/src/openvpn/init.c 2013-03-20 09:28:14.000000000 +0100 ++++ openvpn-2.3.1/src/openvpn/init.c 2014-04-22 13:02:21.351026640 +0200 +@@ -48,6 +48,8 @@ + + #include "occ-inline.h" + ++#include <systemd/sd-daemon.h> ++ + static struct context *static_context; /* GLOBAL */ + + /* +@@ -1241,6 +1243,9 @@ + { + static const char message[] = "Initialization Sequence Completed"; + ++ /* Tell systemd we're ready. */ ++ sd_notify(0, "READY=1"); ++ + /* If we delayed UID/GID downgrade or chroot, do it now */ + do_uid_gid_chroot (c, true); + |