From patchwork Sat Feb 10 11:53:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 7545 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 ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4TX8J61dh9z3wvv for ; Sat, 10 Feb 2024 11:53:42 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4TX8J34XLKz100; Sat, 10 Feb 2024 11:53:39 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4TX8J339TZz2y2B; Sat, 10 Feb 2024 11:53:39 +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 ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4TX8J12nf4z2y2B for ; Sat, 10 Feb 2024 11:53:37 +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 (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4TX8J03dhqz100; Sat, 10 Feb 2024 11:53:36 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1707566016; 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=wvc4V4cqx/MhB1AnZP0em7Y/joOwor9ltaUHD8ZBsSQ=; b=dsbVyRnt+4oK1+Do/dsATg97qh8/oB2Bea61sCaWaOqcoOEoUJaw8qEtRB6v08RrZpCI0u U02R5T7WmdAaQ4Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1707566016; 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=wvc4V4cqx/MhB1AnZP0em7Y/joOwor9ltaUHD8ZBsSQ=; b=goC32VHNNwFQ1i+zT8EQdISnrsu3EmyOHH76CJPVHPJK08mSuW1qXB0ZmcE2KMtCel5gco MG7ilvE6RN6h4Tk5qhlSjuQ7609FF6qQ6kVXJPBYT0FIpYxaEiZt7fNZ7yyiMkl0ypTyvr p/H6W20bDQ/fn5v/bmmvtuszWK685ydGGQOLCfZHpbb4qSO+gQZ34IZbWiuJ051pSvscjj Bz5NFWZuNImaSqwweF4wagyg2sKP5A8dCeRXddI+1Xq96YruW9ZCREH9sS8oPbI9IBN9GQ +MTJunkSgelBMLyov059eu7KTm6s0h0Y7zJRBvO8agdPEeSeB1RFA//aZ3bb+w== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] vdr: add menu entry for vdr website Date: Sat, 10 Feb 2024 12:53:22 +0100 Message-Id: <20240210115322.521732-1-arne_f@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 4J3UDFDVJOI2SLL4K6N7652HTYCERMIX X-Message-ID-Hash: 4J3UDFDVJOI2SLL4K6N7652HTYCERMIX X-MailFrom: arne_f@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 CC: Arne Fitzenreiter 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: we had discussed this on december telco but it is not so easy because our menusystem only shows entry's existing cgi's. so i add a cgi redirect to http://$ENV{SERVER_ADDR}:3000 this add the entry under pakfire and also to service page. Signed-off-by: Arne Fitzenreiter --- config/menu/EX-vdr.menu | 5 +++++ config/rootfiles/common/configroot | 1 + config/rootfiles/common/web-user-interface | 1 + config/rootfiles/packages/vdr | 2 ++ html/cgi-bin/vdr.cgi | 25 ++++++++++++++++++++++ lfs/vdr | 2 +- 6 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 config/menu/EX-vdr.menu create mode 100644 html/cgi-bin/vdr.cgi diff --git a/config/menu/EX-vdr.menu b/config/menu/EX-vdr.menu new file mode 100644 index 000000000..31640678d --- /dev/null +++ b/config/menu/EX-vdr.menu @@ -0,0 +1,5 @@ + $subipfire->{'60.vdr'} = {'caption' => VDR, + 'uri' => '/cgi-bin/vdr.cgi', + 'title' => VDR, + 'enabled' => 1, + }; diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index b920dd248..7235ce10f 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -122,6 +122,7 @@ var/ipfire/menu.d/70-log.menu #var/ipfire/menu.d/EX-mpfire.menu #var/ipfire/menu.d/EX-samba.menu #var/ipfire/menu.d/EX-tor.menu +#var/ipfire/menu.d/EX-vdr.menu #var/ipfire/menu.d/EX-wio.menu #var/ipfire/menu.d/EX-wlanap.menu var/ipfire/modem diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 2fbbcbcf2..f00a3cb37 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -80,6 +80,7 @@ srv/web/ipfire/cgi-bin/time.cgi srv/web/ipfire/cgi-bin/traffic.cgi srv/web/ipfire/cgi-bin/updatexlrator.cgi srv/web/ipfire/cgi-bin/urlfilter.cgi +#srv/web/ipfire/cgi-bin/vdr.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/vulnerabilities.cgi srv/web/ipfire/cgi-bin/wakeonlan.cgi diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr index b08f1f04d..8a6895df4 100644 --- a/config/rootfiles/packages/vdr +++ b/config/rootfiles/packages/vdr @@ -87,3 +87,5 @@ usr/share/vdr var/cache/vdr var/ipfire/backup/addons/includes/vdr #var/video +srv/web/ipfire/cgi-bin/vdr.cgi +var/ipfire/menu.d/EX-vdr.menu diff --git a/html/cgi-bin/vdr.cgi b/html/cgi-bin/vdr.cgi new file mode 100644 index 000000000..aaf722ee3 --- /dev/null +++ b/html/cgi-bin/vdr.cgi @@ -0,0 +1,25 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +print "Status: 302 Moved Temporarily\n"; +print "Location: http://$ENV{SERVER_ADDR}:3000\n\n"; + +exit (0); diff --git a/lfs/vdr b/lfs/vdr index eb761123d..41dd4e92d 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -39,7 +39,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr -PAK_VER = 16 +PAK_VER = 17 DEPS = vdr_streamdev