Message ID | 20241111093721.4311-1-adolf.belka@ipfire.org |
---|---|
State | Staged |
Commit | 6274e1d0b6035474719ffb2e9d1e043b0fa6e6f2 |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> 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 4Xn4G23Qy5z3wwx for <patchwork@web04.haj.ipfire.org>; Mon, 11 Nov 2024 09:37:30 +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) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Xn4G045kJz1C3; Mon, 11 Nov 2024 09:37:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Xn4G02dCtz2xWb; Mon, 11 Nov 2024 09:37:28 +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 4Xn4Fx4PcMz2xLw for <development@lists.ipfire.org>; Mon, 11 Nov 2024 09:37:25 +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 4Xn4Fw5sfvzSP; Mon, 11 Nov 2024 09:37:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1731317845; 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=+gq5KYVFWqmHE8slpu+CJngcjFU2BAJ4Vfxy10u4Cqs=; b=Fkh3BthMYfs/ImAsDs2WxfZv6tcurnlzFg6gZGHnbQmsw6wr1ju63qefPjLRAlD07g+U/r NcjB2czf0hqObbAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1731317845; 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=+gq5KYVFWqmHE8slpu+CJngcjFU2BAJ4Vfxy10u4Cqs=; b=N2zGdHBl3Rv1a9Bc401gDOIP6wZUYi6A39/IXZHg3dYXc4ggyI4psZONj/EW+7vthCq8tu tGYIRMCxj+vUjjKZ/vSgLwstTR4o/u7PDUL+SVAUrIt/B6N1eScRJCAuZ7qy9OVjqC9LDb y2k6vRlhg7x9kfRW0ur5VZg9GXcQQv+i91hFqAew3JFEHs/s0hSG8vM74H1zAPlUpShj91 LRv8ptDYJxNjkkvUPgFuFLGTuSO5eHlRsbpg0KAzLXULgNE7v4mOgEb/0v9KXEG8vbqBe/ EZWSkQ7heIEaeHlMRQeAShNDiEA2XA3MzBSwTIuisyruu6fVxsKku+9uRnUbaQ== From: Adolf Belka <adolf.belka@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH] services.cgi: Remove links from addon services Date: Mon, 11 Nov 2024 10:37:21 +0100 Message-ID: <20241111093721.4311-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 6JNM6STM4RSAYYY3WMTPGS2XYFZZQ2PZ X-Message-ID-Hash: 6JNM6STM4RSAYYY3WMTPGS2XYFZZQ2PZ 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 <development.lists.ipfire.org> Archived-At: <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/message/6JNM6STM4RSAYYY3WMTPGS2XYFZZQ2PZ/> List-Archive: <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Owner: <mailto:development-owner@lists.ipfire.org> List-Post: <mailto:development@lists.ipfire.org> List-Subscribe: <mailto:development-join@lists.ipfire.org> List-Unsubscribe: <mailto:development-leave@lists.ipfire.org> |
Series |
services.cgi: Remove links from addon services
|
|
Commit Message
Adolf Belka
Nov. 11, 2024, 9:37 a.m. UTC
- As discussed in Video Conf Call on Oct 7th 2024 - This patch removes the links from the addon services, in line with the change made to the core services. Tested-by: Adolf Belka <adolf.belka@ipfire.org> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> --- html/cgi-bin/services.cgi | 3 --- 1 file changed, 3 deletions(-)
Comments
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org> Tested-by: Bernhard Bitsch <bbitsch@ipfire.org> Am 11.11.2024 um 10:37 schrieb Adolf Belka: > - As discussed in Video Conf Call on Oct 7th 2024 > - This patch removes the links from the addon services, in line with the change made > to the core services. > > Tested-by: Adolf Belka <adolf.belka@ipfire.org> > Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> > --- > html/cgi-bin/services.cgi | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi > index a3ae13c78..43babf522 100644 > --- a/html/cgi-bin/services.cgi > +++ b/html/cgi-bin/services.cgi > @@ -161,9 +161,6 @@ END > foreach $service (split(/ /, "$metadata{'Services'}")) { > # Add addon name to displayname of service if servicename differs from addon > my $displayname = ($pak ne $service) ? "$service ($pak)" : $service; > - if ( -e "/srv/web/ipfire/cgi-bin/$pak.cgi" ) { > - $displayname = ($pak ne $service) ? "$service (<a href=\'$pak.cgi\'>$pak</a>)" : "<a href=\'$pak.cgi\'>$service</a>"; > - } > > print "<td align='left' width='31%'>$displayname</td> "; >
Acked-by: Michael Tremer <michael.tremer@ipfire.org> > On 11 Nov 2024, at 09:37, Adolf Belka <adolf.belka@ipfire.org> wrote: > > - As discussed in Video Conf Call on Oct 7th 2024 > - This patch removes the links from the addon services, in line with the change made > to the core services. > > Tested-by: Adolf Belka <adolf.belka@ipfire.org> > Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> > --- > html/cgi-bin/services.cgi | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi > index a3ae13c78..43babf522 100644 > --- a/html/cgi-bin/services.cgi > +++ b/html/cgi-bin/services.cgi > @@ -161,9 +161,6 @@ END > foreach $service (split(/ /, "$metadata{'Services'}")) { > # Add addon name to displayname of service if servicename differs from addon > my $displayname = ($pak ne $service) ? "$service ($pak)" : $service; > - if ( -e "/srv/web/ipfire/cgi-bin/$pak.cgi" ) { > - $displayname = ($pak ne $service) ? "$service (<a href=\'$pak.cgi\'>$pak</a>)" : "<a href=\'$pak.cgi\'>$service</a>"; > - } > > print "<td align='left' width='31%'>$displayname</td> "; > > -- > 2.47.0 >
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index a3ae13c78..43babf522 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -161,9 +161,6 @@ END foreach $service (split(/ /, "$metadata{'Services'}")) { # Add addon name to displayname of service if servicename differs from addon my $displayname = ($pak ne $service) ? "$service ($pak)" : $service; - if ( -e "/srv/web/ipfire/cgi-bin/$pak.cgi" ) { - $displayname = ($pak ne $service) ? "$service (<a href=\'$pak.cgi\'>$pak</a>)" : "<a href=\'$pak.cgi\'>$service</a>"; - } print "<td align='left' width='31%'>$displayname</td> ";