From patchwork Mon Oct 3 15:39:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 6035 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Mh5kf5X3Kz3wcJ for ; Mon, 3 Oct 2022 16:24:10 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Mh5kf0lshz1Pk; Mon, 3 Oct 2022 16:24:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Mh5kd715rz2xn3; Mon, 3 Oct 2022 16:24:09 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Mh5kd2220z2xJQ for ; Mon, 3 Oct 2022 16:24:09 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4Mh5kc6XmRz1Q5 for ; Mon, 3 Oct 2022 16:24:08 +0000 (UTC) Received: by disroot.org (Postfix, from userid 107) id A6D224C4EC; Mon, 3 Oct 2022 18:14:42 +0200 (CEST) Received: from chojin.sicho.home (amaterasu.sicho.home [192.168.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (no client certificate requested) (Authenticated sender) by hachiman (MailScanner Milter) with SMTP id 62A5B71E74; Mon, 3 Oct 2022 17:39:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664813681; bh=Hqth7SXQZgzjmXF7N6P8V+A/CKGEJQjgWj3QEMzmfx4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CWQz1d5sCLt0WP8PivhXKKh04Dknmv7CPVpq6YLVrHCdMtYEYKiQn7SchlEoiBwGE bbcvpVtZmx7479D2na43xe/rlHFruj87AoIS8YZa85MRxuWfkJk1GNBTjgCROzaXHO +RYWa0Rfgu23cEKbV8Erfn9FwkAu18izjAtqB2UhRPkIBzE3Cg+ADXWnyEB6qArLBs 01aDsZXii4sh+4+b8NTtwrrrRZOtJf1UJ59v32zkVCRsdK1RPU9nEH1DLCLrDleK7w CGCSm3QWXytuedUvokwK5pob0dDh811jZZV6uCGIGLzvUHZAMvAc/zHekRZn1v/mAF 2TXpUuRsHT3Zw== From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH 1/3] services.cgi: minor cosmetics Date: Mon, 3 Oct 2022 17:39:03 +0200 Message-Id: <20221003153905.14824-2-robin.roevens@disroot.org> In-Reply-To: <20221003153905.14824-1-robin.roevens@disroot.org> References: <20221003153905.14824-1-robin.roevens@disroot.org> Mime-Version: 1.0 X-sicho-MailScanner-ID: 62A5B71E74.A8A80 X-sicho-MailScanner: Found to be clean X-sicho-MailScanner-From: robin.roevens@disroot.org X-sicho-MailScanner-Watermark: 1665416364.34753@tDQZHvN8+dfZkQTdw9oQKA X-Spam-Status: No ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1664814248; a=rsa-sha256; cv=none; b=BdHpskzepx2f95h7JjsyiueBOpY9ULHT74MAzMwPBi0piW5BzrbUtqtjqhQEuU6U3no9lV XKom68DINsqGMJEe+bZnxJUKviUemLrV1OCuqEKCralkf+d66wTDG5dt/ulzTCjkkQ+Q4Q /7W00rj8T42wkSqw4tw+62wUdhfk/kOJk5o5MQRAV3GSRXF6XjqpT0tTveR7cuOvDv7AgL EFyjpB4qrNIYafHyGgoc+S8SMM24IJU/TrAfXKDRtjxm93zdyGiBdEZbQQuY0w721TrItk 2NeysOHY/NofVveRrefjmteh+US6hOhCcLgzqcUBeabGjySO3XNiWBOnKNL9GQ== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=CWQz1d5s; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1664814248; 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:dkim-signature; bh=vH72+C5iA2fXoN3GrKkSJD978Q7X9enj43wJN4/3b+w=; b=mHg1ADIrh/TQhqx0ENQrk0EXGNO38Fq++RitihbddDh8uWeFjfnJFtmWfYCvAJDzewkAng CpmBhvOmPgxsF3V9vXEmqJnLm0m4PEZWdOjTEjm++dwNHWNS+En4eGuQ2YM7iZtoo1m9UC HLlHvu9v+Zat1QgdbmpzPJJcw5rKsRy1bpUy0hv9V/HrGtfcHHef6y8uV0PTXY50OHPdZ3 u2+kuIyXZDfiKTZNYjSbrAwkjpCmnYVLrCJq7BlzLmU6l2gmu8A7dGjJCTu8CtibyFAzdA l5Hujr5dW/KD5SQvq6irWJnZ4auj9jfPlD0u3m9CAcYgRZOa8mKQwQm3QhE6rQ== Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=CWQz1d5s; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-6.55 / 11.00]; REPLY(-4.00)[]; IP_REPUTATION_HAM(-1.07)[asn: 50673(-0.30), country: NL(-0.01), ip: 178.21.23.139(-0.76)]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-1.000]; DKIM_REPUTATION(-0.77)[-0.76741038557295]; SPF_REPUTATION_HAM(-0.67)[-0.66694015940493]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; R_MISSING_CHARSET(0.50)[]; MV_CASE(0.50)[]; BAYES_HAM(-0.50)[79.87%]; R_DKIM_ALLOW(0.26)[disroot.org:s=mail]; R_SPF_ALLOW(-0.20)[+a:c]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[disroot.org:+]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; TO_DN_SOME(0.00)[] X-Rspamd-Queue-Id: 4Mh5kc6XmRz1Q5 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" * Singular 'Service' instead of plural 'Services' as column header of services table * Sort list of services Signed-off-by: Robin Roevens Reviewed-by: Bernhard Bitsch --- 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 e91da884b..d480088a8 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -105,7 +105,7 @@ if ( $querry[0] =~ "processescpu"){
- + @@ -167,7 +167,7 @@ END # Generate list of installed addon pak services my %paklist = &Pakfire::dblist("installed"); - foreach my $pak (keys %paklist) { + foreach my $pak (sort keys %paklist) { my %metadata = &Pakfire::getmetadata($pak, "installed"); my $service; From patchwork Mon Oct 3 15:39:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 6034 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 "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Mh5kM1gwGz3wcJ for ; Mon, 3 Oct 2022 16:23: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 ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Mh5kK09XWz2R1; Mon, 3 Oct 2022 16:23:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Mh5kJ5ZHPz2xn3; Mon, 3 Oct 2022 16:23:52 +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 "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Mh5kH5sqtz2xJQ for ; Mon, 3 Oct 2022 16:23:51 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4Mh5kG16MbzM6 for ; Mon, 3 Oct 2022 16:23:50 +0000 (UTC) Received: by disroot.org (Postfix, from userid 107) id E3CD74C5A0; Mon, 3 Oct 2022 18:14:42 +0200 (CEST) Received: from chojin.sicho.home (amaterasu.sicho.home [192.168.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (no client certificate requested) (Authenticated sender) by hachiman (MailScanner Milter) with SMTP id E879871E87; Mon, 3 Oct 2022 17:39:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664813682; bh=+wqpVAWCWQaqnxi/pNGqr01nVfWMJ742IGAE4oqmhxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=G2xC+TR1EcGb+ypeOSXD/r9iQQR5xk2I2xDB1dFmNzhoN1AxOQxv1xb4vtKbvTH0S k2FB7XICws41T3r4RzjyhXVOqGkIb+usk6cAW4cXSk8nCSbB/rYNjgfkMYQxO634Uh jW+W1VQ7kqwBkQ9kywGvVWQapHljztn2P7MiU7OYoYSQ0bV9T5rCoAvBNX14BXIXYT 1u5bGOkrTVr7IcOLJS6rnWAKToO+ng0GR5/DRPKARkmdN7afgTfqKfRjIsML2HKu8p PpbxeUQobjLGLF8dflekE8ZyxNvc2J8jNW7zWaiJGf0pa3iEBChnlJBpIcUWwRYTkx 9FxOxw39i3qMQ== From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH 2/3] services.cgi: add restart action and restrict action usage Date: Mon, 3 Oct 2022 17:39:04 +0200 Message-Id: <20221003153905.14824-3-robin.roevens@disroot.org> In-Reply-To: <20221003153905.14824-1-robin.roevens@disroot.org> References: <20221003153905.14824-1-robin.roevens@disroot.org> Mime-Version: 1.0 X-sicho-MailScanner-ID: E879871E87.A8A80 X-sicho-MailScanner: Found to be clean X-sicho-MailScanner-From: robin.roevens@disroot.org X-sicho-MailScanner-Watermark: 1665416365.02424@/b/yp9sjx64zRp954INugA X-Spam-Status: No ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1664814230; a=rsa-sha256; cv=none; b=E1/6EZllwaO2qGzbvj6I25hGBrvBpR0iHNuWWB7WcNniuk/bC/2UfJ83hSnq04xH/4RMC3 jnTaV9XiWS0unCTQ4ZnsluN7fkRfSS+FBRb6S0hHQULW4YcuyzHb8u7NsrMEbNIbjRiibm nr1xUJIhJSVCEmZgJ0sRnGVgndH2zbOU5D9KdSRGpKAwdrkr9Swf+ZMa018v03y9KOHQrC /IUNjeyTMaAOV0JDMaTkHe1vDjJcCAAfzBepjqclmQpMgre2XCIYIegYfb4FFaF/N9KGNA vHLz/7FUVbdJEi6WhatLtqO9+Bb9R6MhBYhg/NtbBXL1M5kbyxzEejVBtT2XnQ== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=G2xC+TR1; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1664814230; 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:dkim-signature; bh=noGbtIsbZrmKYkVmp8xC/fDcc2dZB+c+bp5J3FNK/e0=; b=Dph31MlxspFQ0fB99uTeaPXUOwkfjA/9W9ENQ0I/WUL4QmAm6Pzo/A5YUIZVBHZLoozGLy VE/X0Xfipgu/oWOBGKE3aWHaWi9rzJzhsrnvnbewzKF/PBn1VhgnAME8VcydO84PTnWmWZ tnHED4sjTsHPPSa1ryteyYEpEnBnx8jwR7aEc0tc0Nz2gd16bsav8bU0A1Y2W8tUi09Sar HlHjLL9nu+GBfj5m4UJvCaXmALnkh48L5cApzucpZYT2sKWyvNy+05Bxctxp9DnisSGSrT LEqQy+3ms8FNtdNI6/j0tAy/t7WD9Lva6bPYJ5jMe9NamIa/dIa6dKQfqVWHBA== Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=G2xC+TR1; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-4.74 / 11.00]; BAYES_HAM(-3.00)[99.99%]; IP_REPUTATION_HAM(-1.06)[asn: 50673(-0.30), country: NL(-0.01), ip: 178.21.23.139(-0.76)]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-0.996]; DKIM_REPUTATION(-0.76)[-0.76477419073647]; SPF_REPUTATION_HAM(-0.66)[-0.65924652726237]; R_MISSING_CHARSET(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; MV_CASE(0.50)[]; R_DKIM_ALLOW(0.26)[disroot.org:s=mail]; MIME_HTML_ONLY(0.20)[]; R_SPF_ALLOW(-0.20)[+a]; MX_GOOD(-0.01)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:~]; DKIM_TRACE(0.00)[disroot.org:+]; TO_DN_SOME(0.00)[] X-Rspamd-Queue-Id: 4Mh5kG16MbzM6 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" * Add restart action to services. * Only display available actions for a service: Start when service is stopped or Stop and Restart when a service is running. Signed-off-by: Robin Roevens Reviewed-by: Bernhard Bitsch --- html/cgi-bin/services.cgi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index d480088a8..498d7fd8e 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -189,8 +189,6 @@ END my $status = isautorun($pak,$service,$col); print "$status "; - print ""; - print " "; my $status = isrunningaddon($pak,$service,$col); $status =~ s/\\[[0-1]\;[0-9]+m//g; @@ -300,7 +298,9 @@ sub isrunningaddon (@) { my $testcmd = @testcmd[0]; if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){ - $status = ""; + $status = " "; + $status .= " "; + $status .= ""; $testcmd =~ s/.* //gi; $testcmd =~ s/[a-z_]//gi; $testcmd =~ s/\[[0-1]\;[0-9]+//gi; @@ -323,7 +323,8 @@ sub isrunningaddon (@) { } $status .=""; }else{ - $status = ""; + $status = ""; + $status .= ""; } return $status; } From patchwork Mon Oct 3 15:39:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 6036 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Mh5lB5YcYz3wcJ for ; Mon, 3 Oct 2022 16:24:38 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Mh5lB1Zcnz1Cb; Mon, 3 Oct 2022 16:24:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Mh5lB0hcpz2y1h; Mon, 3 Oct 2022 16:24:38 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Mh5l86Stgz2xJQ for ; Mon, 3 Oct 2022 16:24:36 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4Mh5l82NgGzWy for ; Mon, 3 Oct 2022 16:24:36 +0000 (UTC) Received: by disroot.org (Postfix, from userid 107) id F3F264C365; Mon, 3 Oct 2022 18:14:41 +0200 (CEST) Received: from chojin.sicho.home (amaterasu.sicho.home [192.168.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (no client certificate requested) (Authenticated sender) by hachiman (MailScanner Milter) with SMTP id D3D3571E95; Mon, 3 Oct 2022 17:39:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1664813681; bh=KgPGKDLiJ+GgzVR4xdybw2IHfe7UnLCZ9RcHmV2gLdY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=H4508WCNwM8lGhaqP0LDLgXwELsJgsbYUj3840hoQfyQQ5JOJrtz7CeX276Iva/w0 I8I8QIsYHmlqkKt4t7LWL9t91TVWynEc/X0HcC08HyA67mg/OCkCDS3XT4wl7uC2j6 QFWG1zVHeBauWiPhwNG5oTsrpMt6sO0Z6zx9Y5PGH2y+ATGtktuPpWLgDr8GE7COGC cMuQY9nm5wJraFJM6ru/NRn3HQR822uoBwr4H/n7rKMIlXHfWKd9La1zYUiBVzHhP+ 1+kEQ/kw5rBodbROsVQqln7/65RmVf+WeFBtiJy1pJugRpUFVxbol2+D0tOj7ycdEn iJZW9lHceBu8g== From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH 3/3] services.cgi: add link to addon config if ui exists for it Date: Mon, 3 Oct 2022 17:39:05 +0200 Message-Id: <20221003153905.14824-4-robin.roevens@disroot.org> In-Reply-To: <20221003153905.14824-1-robin.roevens@disroot.org> References: <20221003153905.14824-1-robin.roevens@disroot.org> Mime-Version: 1.0 X-sicho-MailScanner-ID: D3D3571E95.A8A80 X-sicho-MailScanner: Found to be clean X-sicho-MailScanner-From: robin.roevens@disroot.org X-sicho-MailScanner-Watermark: 1665416366.06491@g+r9uUZU7dq8cbrmYHB9jw X-Spam-Status: No ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1664814276; a=rsa-sha256; cv=none; b=jLjvbN0o7Ww1GGC5AnNZGNyh8Hzug/PqtltMg7cgQMXReaaPnprrNg8xoSUwIvLJKzb5XZ V1HlzorRDVgOWTvsbwh1v3RXeJ7Iljo+eglhE/yoiVH671tcwjdwBTjoHOV8HtDQVr5v8o pkxlM0G/BAzcgQK13Nz+bZgTk3cfx/Ee9rFEAohIOS4OU0pzNXiCbrQ4zT/X2oPpBG7dj1 cuYEWJmQvVQGhMYTYwl2SHxGXPgRTVuv6REqK3u0FohQkMAO0nwdiHiZwH1B9DLz+l+yGu EUV2UtDpdIGULbcunLw/hLEXzZ8ADdpsxRUwrIFcD9cndT+wgo36kf0CbsAzKw== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=H4508WCN; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1664814276; 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:dkim-signature; bh=0qrxh4lf8P/LmAJoaf9T5BF6nOd9Mna2nF4VrpdJryA=; b=LlgQedeox6XfBNVjKrRYwCOrYALtynJGN0/wblg5BBBxoDKd4hk0YhIAfakzmMKyfxvuis reSEYjq+i2JYBK2u1su5eb3sFxdEFwyCwLMdPtlFQqKl7pY/kpTlCwiMtnztcW5DNqh+oM 6hDpSEy7LsNVg6tAMPzgOSO1BTJ7hM2mwSjHFAMRPDvT91mwFpmQnxpHvjVuw+kOHwLDI1 tdJl6kihnWx+KFQWa/fCRxxbVJ3ke7QVdhdSEXGttpr247L+EB1HawDiDNGEOc1eyznvcw GA/hFrxihwN+eRZhbaUxniNVREouCokajSS1Stp40Ht7c6gOSPvABTyLfXMmJQ== Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=H4508WCN; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-9.03 / 11.00]; REPLY(-4.00)[]; BAYES_HAM(-2.98)[99.90%]; IP_REPUTATION_HAM(-1.07)[asn: 50673(-0.30), country: NL(-0.01), ip: 178.21.23.139(-0.76)]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-1.000]; DKIM_REPUTATION(-0.77)[-0.76741109695771]; SPF_REPUTATION_HAM(-0.67)[-0.66694155491188]; R_MISSING_CHARSET(0.50)[]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; R_DKIM_ALLOW(0.26)[disroot.org:s=mail]; R_SPF_ALLOW(-0.20)[+a:c]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[disroot.org:+]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; TO_DN_SOME(0.00)[] X-Rspamd-Queue-Id: 4Mh5l82NgGzWy 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" * If a cgi file exists with the same name as an addon, the displayed service will be a link to that cgi file. Signed-off-by: Robin Roevens Reviewed-by: Bernhard Bitsch --- html/cgi-bin/services.cgi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 498d7fd8e..d988b29a5 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -185,6 +185,10 @@ END # 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 ($pak)" : "$service"; + } + print " "; my $status = isautorun($pak,$service,$col);
$Lang::tr{'services'}$Lang::tr{'service'} $Lang::tr{'status'} PID $Lang::tr{'memory'}$Lang::tr{$Lang::tr{$Lang::tr{'running'}$Lang::tr{$Lang::tr{$Lang::tr{'running'}$memory KB$Lang::tr{'stopped'}$Lang::tr{$Lang::tr{'stopped'}$displayname