Re: [PATCH] OpenVPN: Delete RRD dir if connection is deleted

[ummeegge <ummeegge@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]

Hi Peter,

Am Samstag, den 28.03.2020, 09:25 +0000 schrieb Peter Müller:
> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
> 
> In my opinion, this fixes #11713.
Haven´t seen that one, yes i think so.
Have found another one in here --> 
https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=html/cgi-bin/ovpnmain.cgi;h=e76a688fe7dcda0b77bf716eb2538342cd775b00;hb=HEAD#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

> 
> > Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
> > ---
> >  html/cgi-bin/ovpnmain.cgi | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > 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]);
> >  
> >  		delete $confighash{$cgiparams{'KEY'}};
> >  		my $temp2 = `/usr/bin/openssl ca -gencrl -out
> > ${General::swroot}/ovpn/crls/cacrl.pem -config
> > ${General::swroot}/ovpn/openssl/ovpn.cnf`;
> >