From patchwork Sat Mar 28 08:32:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: ummeegge X-Patchwork-Id: 2863 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48qBmq402yz3yBn for ; Sat, 28 Mar 2020 08:32:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48qBmp0KgBz1Q3; Sat, 28 Mar 2020 08:32:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48qBmn4MSnz2yVm; Sat, 28 Mar 2020 08:32:41 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48qBml4715z2xjt for ; Sat, 28 Mar 2020 08:32:39 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48qBmk6jnLz1Q3; Sat, 28 Mar 2020 08:32:38 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1585384359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=qg6mmMwXb2LEZ4AQ0tHqHD2zLX6DIUQrO0ipdLWFo7M=; b=aSRMsQIFO+/HII66wVmHRo3wSO1FkYbsZ0QlbSWhFGXGADj5z8KzztywCzUO3Gwd3Hfr79 raMvDOuPcdnbSpBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1585384359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=qg6mmMwXb2LEZ4AQ0tHqHD2zLX6DIUQrO0ipdLWFo7M=; b=wmuU/7xis9kDROIiNnDBRZzmpNc3CMAyIxbg70WNa7buNrAvmX9N109uXe/AUq6CL1YxOB I8dERxFiC4bYhztko/8yY4eibQZ0xr/gK42WOZheUWJcdEiHXgp9EmY26k8dWPnaqJg/3y bfp0dFm3j5g8HHFPS+FkbRoJp/YRpo0eXmxinawwanC0XxTJlen3DyfQy7Cuo3BA34de22 utA7OgdfWyCW/kqF12F8niF6ak5Olf0RVuwMYU6eiT0RfzsNxuW5lk+9ippv3DZT5ne4S6 aRHFCBN/wNFCIHHNY8+nF996tQINZEtdC1R/GC37a1CQfBNdyQoRNRX67ncFZQ== From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH] OpenVPN: Delete RRD dir if connection is deleted Date: Sat, 28 Mar 2020 09:32:24 +0100 Message-Id: <20200328083224.2925-1-ummeegge@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=ummeegge@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Erik Kapfer Reviewed-by: Peter Müller --- 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`;