From patchwork Sat Dec 14 17:47:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8326 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 (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Y9YZZ4DQBz3wxp for ; Sat, 14 Dec 2024 17:47:50 +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 RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Y9YZR19qzz1RH; Sat, 14 Dec 2024 17:47:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Y9YZQ4QX9z33BL; Sat, 14 Dec 2024 17:47:42 +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 (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Y9YZN0v04z2xLw for ; Sat, 14 Dec 2024 17:47:40 +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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Y9YZM1HV8z12m; Sat, 14 Dec 2024 17:47:39 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1734198459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LoF3jXmYzpuydybYNhzUmWoQa6tFge4hixGezIsJXDk=; b=uS1N4XsEOEIpoLwiKzponXOi+7P6ty2cY80aXBdp2ju4jRwk19Ic8KspY4PKwzKrYNfB+1 +r6HWqqvuMG/x1Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1734198459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LoF3jXmYzpuydybYNhzUmWoQa6tFge4hixGezIsJXDk=; b=r4Lmi2sZ1gFr33Ry/jXJKUoUIoefVT6R8PO+jfFB6Al0vDO1i08Na3uPzhMBe3dIL1XhLT Lo+3zBy1JZNpu4dVsisEJU7YASRl1spIZkfEJCv5RUTXJd9pAp0PBIA+r9BAIOzr9wQwL8 H4E75AA0jAxXHdYFB67RDE0XZWs1XqmBUyIc2usuVeTpJ6xPgZotofxcTdHEdMBnKeFdxB AdZKwTclH3KVqix8G5xN23QH0n2OC4qt/zHkREcXdTi7tIZNwPiYdb2FdGJgis46T6ADhC k9NyEsuNWLsfErlQD3+lNi9b+AfojNle6dLHkUSG4U+8jdwEckHEL2SgpitvHA== From: Adolf Belka To: development@lists.ipfire.org Subject: [DEV PATCH 1/3] ovpnmain.cgi: Allow the openvpn-rw status to be shown in openvpn WUI Date: Sat, 14 Dec 2024 18:47:16 +0100 Message-ID: <20241214174718.22140-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: NGBAZBGNMES5K2MNC52FHQNGBP67SDAE X-Message-ID-Hash: NGBAZBGNMES5K2MNC52FHQNGBP67SDAE X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - The main openvpn process name has been changed to openvpn-rw. This change is needed so that if openvpn-rw is running the status shows that on the OpenVPN WUI page Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- html/cgi-bin/ovpnmain.cgi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 html/cgi-bin/ovpnmain.cgi diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi old mode 100755 new mode 100644 index bd102f4bc..843edc519 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team # +# Copyright (C) 2007-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -5063,8 +5063,8 @@ END # Show the service status &Header::ServiceStatus({ $Lang::tr{'ovpn roadwarrior server'} => { - "process" => "openvpn", - "pidfile" => "/var/run/openvpn.pid", + "process" => "openvpn-rw", + "pidfile" => "/var/run/openvpn-rw.pid" } }); From patchwork Sat Dec 14 17:47:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8327 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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Y9YZg00rNz3wxp for ; Sat, 14 Dec 2024 17:47:54 +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 RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Y9YZS05Lcz4Y8; Sat, 14 Dec 2024 17:47:44 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Y9YZQ6XpJz3419; Sat, 14 Dec 2024 17:47:42 +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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Y9YZN1Pq7z2xLw for ; Sat, 14 Dec 2024 17:47:40 +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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Y9YZM64j7z1K2; Sat, 14 Dec 2024 17:47:39 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1734198459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HbtXYpm9N6uZY2k3yMB5NxLZTCwcj5ST2Q4vDJamcBM=; b=18RA/JW/zgwHTeNYtUHu4BEcW6R2knt0CmJeahNYwZJKwIBj7U6k4sYSng8ImAGSJf4I8T 8GSg+lH63YJwN+Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1734198459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HbtXYpm9N6uZY2k3yMB5NxLZTCwcj5ST2Q4vDJamcBM=; b=HTmZtim+CbDUZZBK/PEOgM2izTv+eaDKeVTNE8Z/B0KvFqwH0B0Y20sKo2G/aQ7nd2sfLZ ZX/5FflIJqbfkBi7nhBxL2Mo6/kHGiawXtX0h0NFLw57n89IP2dJqBJCH/ffDoN15RuTld bciM/J84rQMeuemcQhd4Bq7xNKydZChL3hKMmCNr+MzdiznuMsWKK3zF4+BHlYWYy/hW63 h+a0aREA7cFRbBNPKEjqDGFHiStOViFmavZxSoZIIUSuAPZ6ZuwQ9gpg7kzrDVkYm+FcAK It4TOc4pCQWkJcC4qdANqyFoNndQPoLwz7bKQFYZHdoBoDiSzSBZN2JNaEVoJw== From: Adolf Belka To: development@lists.ipfire.org Subject: [DEV PATCH 2/3] services.cgi: Allow the openvpn-rw status to be shown in the Services WUI page Date: Sat, 14 Dec 2024 18:47:17 +0100 Message-ID: <20241214174718.22140-2-adolf.belka@ipfire.org> In-Reply-To: <20241214174718.22140-1-adolf.belka@ipfire.org> References: <20241214174718.22140-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: QAEY5ICEYC6TMPFUCVTS3FO57XSE5HBC X-Message-ID-Hash: QAEY5ICEYC6TMPFUCVTS3FO57XSE5HBC X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - The main openvpn process name has been changed to openvpn-rw. This change is needed so that if openvpn-rw is running the status shows that on the Services WUI page Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- html/cgi-bin/services.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index a3ae13c78..734f08e11 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -113,8 +113,8 @@ $querry[1] = 'hour' unless defined $querry[1]; # OpenVPN Roadwarrior $Lang::tr{'ovpn roadwarrior server'} => { - "process" => "openvpn", - "pidfile" => "/var/run/openvpn.pid", + "process" => "openvpn-rw", + "pidfile" => "/var/run/openvpn-rw.pid", } }); From patchwork Sat Dec 14 17:47:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8328 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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Y9YZg063Gz3x1C for ; Sat, 14 Dec 2024 17:47:55 +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 RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Y9YZS067Jz4dv; Sat, 14 Dec 2024 17:47:44 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Y9YZR0vjcz34H1; Sat, 14 Dec 2024 17:47:43 +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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Y9YZN3Qk2z2xLw for ; Sat, 14 Dec 2024 17:47:40 +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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Y9YZN172Cz1RH; Sat, 14 Dec 2024 17:47:40 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1734198460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5LBgR5fmOhfY4AlioBTiHYruDULN6z+V0OgOVzzOEQo=; b=XSCqMgqGjtSvMrQHeqtMt7ZpEp5ElmpP+5S3aTsbVdigldRrgoUyjW2QccBfDOXwzWig/T pZ/X+0xbeu1BkzAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1734198460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5LBgR5fmOhfY4AlioBTiHYruDULN6z+V0OgOVzzOEQo=; b=Mb/Ni9CWVA2yXDPvwAlZQLe7/9lCj1PIu2vfQDlO1cN3Wtjv9DIlcvucE0XjMYf3r0U9at 82x918EukMHGi5Se9oLXwQOMlpgLDLPEUPeM2PGZ78jWu/Ijk/EVJGUCRlJ/fsbu2pr7YP XQCiC0Pr4m/VqAaMnsK2oUA2jOWKXgJ4jTfHT0k7HLHhz2kwG1VY3E6xIlazgRvK6v20cl pE81JTGc8CmPFUCD37xOs0PLEu/NbkmAFAB/4vogVUMI96eW9soluTre+KZLD1ycn2eEOe ktxBxSh1uBQdAxEr3v9L8qQ+ngxiur2jiZk+WQgrsBwhJPgUOXUxMey4eUcT5g== From: Adolf Belka To: development@lists.ipfire.org Subject: [DEV PATCH 3/3] openvpn-rw: Correct typo in openvpn-rw initscript Date: Sat, 14 Dec 2024 18:47:18 +0100 Message-ID: <20241214174718.22140-3-adolf.belka@ipfire.org> In-Reply-To: <20241214174718.22140-1-adolf.belka@ipfire.org> References: <20241214174718.22140-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: FT33UIO267ZO34C3CBOTYA7Z2DDG3R52 X-Message-ID-Hash: FT33UIO267ZO34C3CBOTYA7Z2DDG3R52 X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Adolf Belka --- src/initscripts/system/openvpn-rw | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/initscripts/system/openvpn-rw b/src/initscripts/system/openvpn-rw index 49b01daca..e0483e4b1 100644 --- a/src/initscripts/system/openvpn-rw +++ b/src/initscripts/system/openvpn-rw @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -54,7 +54,7 @@ case "${1}" in stop) boot_mesg "Stopping OpenVPN Authenticator..." - PIDFILE= killproc /usr/sbin/openvon-authenticator + PIDFILE= killproc /usr/sbin/openvpn-authenticator boot_mesg "Stopping OpenVPN Roadwarrior Server..." killproc /usr/sbin/openvpn