From mboxrd@z Thu Jan  1 00:00:00 1970
From: ummeegge <ummeegge@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] OpenVPN: Delete RRD dir if connection is deleted
Date: Sat, 28 Mar 2020 10:45:36 +0100
Message-ID: <e76b2faed2678c99e73615090f3dc3b7af3ffecc.camel@ipfire.org>
In-Reply-To: <c4e7cd49-f8b8-c88e-c193-20ccb4bf856a@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4319912382392372263=="
List-Id: <development.lists.ipfire.org>

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

Hi Peter,

Am Samstag, den 28.03.2020, 09:25 +0000 schrieb Peter M=C3=BCller:
> Reviewed-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
>=20
> In my opinion, this fixes #11713.
Haven=C2=B4t seen that one, yes i think so.
Have found another one in here -->=20
https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dblob;f=3Dhtml/cgi-bin/ovpnmain=
.cgi;h=3De76a688fe7dcda0b77bf716eb2538342cd775b00;hb=3DHEAD#l1224
which can not be solved in this way. Need to have another look into this.
Will send a separate patch then for "delete all RRDs if X509 is deleted".

Need a little more time.

Best,

Erik

>=20
> > 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{'KEY'}}[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


--===============4319912382392372263==--