openvpn-rw: Use a sensible name for the PID file

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 3b4d1a0fcadc42e6aa6c8aef346219b45b6adbed..2b55a1d7200e3b8d5d0f1556e5e0d9658b47f319 100755 (executable)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -85,6 +85,7 @@ my %CIPHERS = (
 # Use the precomputed DH paramter from RFC7919
 my $DHPARAM = "/etc/ssl/ffdhe4096.pem";
 
+my $RW_PID    = "/var/run/openvpn-rw.pid";
 my $RW_STATUS = "/var/run/openvpn-rw.log";
 
 ###
@@ -215,7 +216,7 @@ sub writeserverconf {
     print CONF "#OpenVPN Server conf\n";
     print CONF "\n";
     print CONF "daemon openvpnserver\n";
-    print CONF "writepid /var/run/openvpn.pid\n";
+    print CONF "writepid $RW_PID\n";
     print CONF "#DAN prepare OpenVPN for listening on blue and orange\n";
     print CONF ";local $sovpnsettings{'VPN_IP'}\n";
     print CONF "dev tun\n";

diff --git a/src/initscripts/system/openvpn-rw b/src/initscripts/system/openvpn-rw
index 03075148ef1784390426353f56e554bcb81e15ec..6e5fd8a3b67c991c4ee5161ee3dba6343f120953 100644 (file)
--- a/src/initscripts/system/openvpn-rw
+++ b/src/initscripts/system/openvpn-rw
@@ -22,7 +22,7 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-PIDFILE="/var/run/openvpn.pid"
+PIDFILE="/var/run/openvpn-rw.pid"
 
 # Load configuration
 eval $(/usr/local/bin/readhash /var/ipfire/ovpn/settings)