From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] OpenVPN: Delete RRD dir if connection is deleted
Date: Sat, 28 Mar 2020 09:25:00 +0000
Message-ID: <c4e7cd49-f8b8-c88e-c193-20ccb4bf856a@ipfire.org>
In-Reply-To: <20200328083224.2925-1-ummeegge@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3656009053502705108=="
List-Id: <development.lists.ipfire.org>

--===============3656009053502705108==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>

In my opinion, this fixes #11713.

> Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
> ---
>  html/cgi-bin/ovpnmain.cgi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
> index ce9524df7..00ecd77a0 100644
> --- a/html/cgi-bin/ovpnmain.cgi
> +++ b/html/cgi-bin/ovpnmain.cgi
> @@ -2513,7 +2513,7 @@ else
>  # CCD end
>  		# Update collectd configuration and delete all RRD files of the removed =
connection
>  		&writecollectdconf();
> -		system ("/usr/local/bin/openvpnctrl -drrd $confighash{$cgiparams{'KEY'}}=
[1]");
> +		system ('/usr/local/bin/openvpnctrl', '-drrd', $confighash{$cgiparams{'K=
EY'}}[1]);
> =20
>  		delete $confighash{$cgiparams{'KEY'}};
>  		my $temp2 =3D `/usr/bin/openssl ca -gencrl -out ${General::swroot}/ovpn/=
crls/cacrl.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`;
>=20

--===============3656009053502705108==--