From a53b94939574105a2952caf3a5caa366fdfa7366 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 16 Apr 2024 14:00:35 +0200 Subject: [PATCH] openvpn-rw: Use a sensible name for the PID file Signed-off-by: Michael Tremer --- html/cgi-bin/ovpnmain.cgi | 3 ++- src/initscripts/system/openvpn-rw | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 26dbab867..390af45a6 100755 --- 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 03075148e..6e5fd8a3b 100644 --- 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) -- 2.39.5