From patchwork Wed Apr 5 12:28:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6768 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 4Ps3pC6wz5z3xD5 for ; Wed, 5 Apr 2023 12:28:51 +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 4Ps3p752gvzdy; Wed, 5 Apr 2023 12:28:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ps3p747MCz30K1; Wed, 5 Apr 2023 12:28:47 +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 4Ps3p60XwFz2xX5 for ; Wed, 5 Apr 2023 12:28:46 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ps3p51wj6zdy; Wed, 5 Apr 2023 12:28:45 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680697725; 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=MHX8LuKoGXM8VRTG3XtzOT4oY+ONgeItqdEl/Sb3Vkk=; b=usIBGe+QaknvKdMkHtNGHPXNDmCfjvzqBu/QMk4LDu3O5nUmQ9BRsIB9lCKN1EPja/weeH f4xu96NDwinEz6AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680697725; 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=MHX8LuKoGXM8VRTG3XtzOT4oY+ONgeItqdEl/Sb3Vkk=; b=ezuHZIOnSXqh94b7MI779mnTmozIVauvoaxNmb+3YXfHHzGWcbXjBE9nzYtaxdJx+L5Ufq qy3GJ8Yn5pLATWXhN/wwgD5T5BXNHpet1HRaFDgYRXilc2qk7UQJ7zQkk78FvIgKF2BhuE iiKEg8DagsRlNdTrSQrzYsyWslXb279fgbFxhR4N0Mg7MaH+2nN9ZJw3TdZrM5UcSHfD+9 bGyMBqv45MtnjZPQmeGfOkoMYtVB4O3LbFKGhmjA7TynJB1j1vHGiePNwvw2GsYKBjPd+j pK2uPXdTRPaTLBrZbEzbUkNKmwXqDPUs8BfiDg6QP8kWqizibuGDafn0UHmPtg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 01/11] wio: This is a patch series relocating wio into the standard ipfire directories Date: Wed, 5 Apr 2023 14:28:25 +0200 Message-Id: <20230405122835.12821-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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" - This patch is the changes to the wio lfs file related to the relocations - The modified patch series was built and the generated wio-1.3.2-17.ipfire file was used to install wio on a testbed vm system. Everything worked. Tested out with various hosts on the system, tested the graphs, tested adding hosts from a network scan and from the arp table and everything worked fine. So all the relocations look to have worked. - Files were only relocated, the wio code was not modified in any way. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- lfs/wio | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/lfs/wio b/lfs/wio index 08bac2e02..b173b935a 100644 --- a/lfs/wio +++ b/lfs/wio @@ -32,7 +32,7 @@ THISAPP = wio-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = wio -PAK_VER = 16 +PAK_VER = 17 DEPS = @@ -59,31 +59,28 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cp -R $(DIR_SRC)/src/wio/ $(DIR_APP) - cd $(DIR_APP) + @rm -rf $(DIR_APP) mkdir -p /usr/lib/wio mkdir -p /var/log/wio mkdir -p /var/log/rrd/wio - mkdir -p /srv/web/ipfire/html/images/wio mkdir -p /var/ipfire/wio - - install -v -m 755 $(DIR_APP)/wio/wio.cgi /srv/web/ipfire/cgi-bin/ - install -v -m 755 $(DIR_APP)/wio/wiographs.cgi /srv/web/ipfire/cgi-bin/ - install -v -m 755 $(DIR_APP)/wio/wio /etc/fcron.minutely/ - install -v -m 644 $(DIR_APP)/wio/main/wio.conf /var/ipfire/wio/ - install -v -m 754 $(DIR_APP)/wio/main/wio.pl /var/ipfire/wio/ - install -v -m 754 $(DIR_APP)/wio/main/wiovpn.pl /var/ipfire/wio/ - install -v -m 644 $(DIR_APP)/wio/wio-lib.pl /usr/lib/wio/ - install -v -m 644 $(DIR_APP)/wio/wio-graphs.pl /usr/lib/wio/ - install -v -m 644 $(DIR_APP)/wio/wioips /var/log/wio/ - install -v -m 644 $(DIR_APP)/wio/images/* /srv/web/ipfire/html/images/wio/ - install -v -m 644 $(DIR_APP)/wio/lang/wio.de.pl /var/ipfire/addon-lang/ - install -v -m 644 $(DIR_APP)/wio/lang/wio.en.pl /var/ipfire/addon-lang/ - install -v -m 644 $(DIR_APP)/wio/lang/wio.es.pl /var/ipfire/addon-lang/ - install -v -m 644 $(DIR_APP)/wio/lang/wio.fr.pl /var/ipfire/addon-lang/ - install -v -m 644 $(DIR_APP)/wio/lang/wio.tr.pl /var/ipfire/addon-lang/ - install -v -m 644 $(DIR_APP)/wio/EX-wio.menu /var/ipfire/menu.d/ - install -v -m 644 $(DIR_APP)/wio/config/backup/includes/wio /var/ipfire/backup/addons/includes/wio + chmod 755 /srv/web/ipfire/html/images/wio + + install -v -m 755 $(DIR_SRC)/config/wio/wio /etc/fcron.minutely/ + install -v -m 644 $(DIR_SRC)/config/wio/wio.conf /var/ipfire/wio/ + install -v -m 754 $(DIR_SRC)/config/wio/wio.pl /var/ipfire/wio/ + install -v -m 754 $(DIR_SRC)/config/wio/wiovpn.pl /var/ipfire/wio/ + install -v -m 644 $(DIR_SRC)/config/wio/wio-lib.pl /usr/lib/wio/ + install -v -m 644 $(DIR_SRC)/config/wio/wio-graphs.pl /usr/lib/wio/ + install -v -m 644 $(DIR_SRC)/config/wio/wioips /var/log/wio/ + + # Install addon-specific language-files. + install -v -m 004 $(DIR_SRC)/config/wio/wio.*.pl \ + /var/ipfire/addon-lang/ + + # install backup include file + install -v -m 644 $(DIR_SRC)/config/backup/includes/wio \ + /var/ipfire/backup/addons/includes/wio @rm -rf $(DIR_APP) @$(POSTBUILD) From patchwork Wed Apr 5 12:28:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6769 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 4Ps3pF3p7rz3xD5 for ; Wed, 5 Apr 2023 12:28:53 +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 4Ps3p8190tz5SC; Wed, 5 Apr 2023 12:28:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ps3p74yVwz30KJ; Wed, 5 Apr 2023 12:28:47 +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 4Ps3p60wchz2xfc for ; Wed, 5 Apr 2023 12:28:46 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ps3p561h9zkF; Wed, 5 Apr 2023 12:28:45 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680697725; 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=jMzGFP1m461X5VAKJtDtqO8rd7PuzUIkpCWtGD/6dSs=; b=CMQP2Ioe7+eyOk7WQB+KSkDTgG7vcQSqPya9b6fMBKHF5/jOOpFSfguQ7aedXYqZr12PDY GoK7EG4iOSKof3Bw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680697725; 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=jMzGFP1m461X5VAKJtDtqO8rd7PuzUIkpCWtGD/6dSs=; b=pqIjsLcuI9yZz73bzJ2Z3mtXq1Q1YA8zeK01pc0+tHUxXJPMd9YAtcIOMm8WrT9InUs5yo jSCBDuNemiTxwxlsu6l0gZJLAMm0fDYP1mNSfCzLmYQAkM8C2rrftxUw1jD5ge9qNOk2um 6VfguKrHh0HkmtV/9FddkANrrd1h0FIdT8YxNPdOKVoj9Mhvd+BFFxWptLpjxYpW6xVXdW aEolN2yHfY/FQUITcxHBvKfWWrKSpR6Vn67D1ZaT0t1KVnvCGRLl5VIZQ8GpAYGAjm5e1r /wSGfIm9OsvxNDTdPn9YoiYZf8zIQ9CtzqAP3ahzsGV13tG7iOAptiq1o06ddQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 02/11] wio: Move backup/includes file to standard IPFire location Date: Wed, 5 Apr 2023 14:28:26 +0200 Message-Id: <20230405122835.12821-2-adolf.belka@ipfire.org> In-Reply-To: <20230405122835.12821-1-adolf.belka@ipfire.org> References: <20230405122835.12821-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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: Adolf Belka --- {src/wio/config => config}/backup/includes/wio | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {src/wio/config => config}/backup/includes/wio (100%) diff --git a/src/wio/config/backup/includes/wio b/config/backup/includes/wio similarity index 100% rename from src/wio/config/backup/includes/wio rename to config/backup/includes/wio From patchwork Wed Apr 5 12:28:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6771 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 4Ps3pG6znqz3xG5 for ; Wed, 5 Apr 2023 12:28: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 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 4Ps3p81780z3pS; Wed, 5 Apr 2023 12:28:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ps3p75Nl6z30Kb; Wed, 5 Apr 2023 12:28:47 +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 4Ps3p61pPCz2xxQ for ; Wed, 5 Apr 2023 12:28:46 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ps3p60QX8z2wx; Wed, 5 Apr 2023 12:28:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680697726; 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=zGivA2OXyviXD+f0KUunluHWRF7wWIu5oYGxSJpkLRs=; b=vBagbTMKPii0s2xAmsbnI8Epuu0QYMGHyC5nnAfqoMF2jo2VztSEu0aeJtshNUUR72ghbj I4CLHLjOeWhuPv2anbZO4ROOh7vfwQ7mFoEmButQtgJf+ZetHpQDhAoX19lVRN7GxNfsoX OMUUOhG0YWKRQzAkG8vtqS3hq+RL40Ep/ojH+ZNQ7A9hTZ/9XFZVBSQ0m6edZbzarai++f BdQ9Dh824ly52CbX1S/RZPB8mutp9VYj+tGgWUupYVcYj8xrZ71oD5WT/3tjKRzFb66uo1 daNG1AdRMKj88oWEzOrjEWRlxf5Rt/nsMrhCU4Y4R51gUVm2PMcN4ZJKoDR9MA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680697726; 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=zGivA2OXyviXD+f0KUunluHWRF7wWIu5oYGxSJpkLRs=; b=pr75eRtPi1R1viZ+XastbV0QQsHOFZMWYeGtvOe+Axe0aguZsPCKmjufH5LLJbO/3nVDEI v4KANOT0M+3Es+Cg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 03/11] wio: images moved to standard IPFire location Date: Wed, 5 Apr 2023 14:28:27 +0200 Message-Id: <20230405122835.12821-3-adolf.belka@ipfire.org> In-Reply-To: <20230405122835.12821-1-adolf.belka@ipfire.org> References: <20230405122835.12821-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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: Adolf Belka --- {src/wio/images => html/html/images/wio}/add.png | Bin {src/wio/images => html/html/images/wio}/back.png | Bin {src/wio/images => html/html/images/wio}/blue.png | Bin {src/wio/images => html/html/images/wio}/fqdn.png | Bin {src/wio/images => html/html/images/wio}/graph.png | Bin {src/wio/images => html/html/images/wio}/green.png | Bin {src/wio/images => html/html/images/wio}/http.png | Bin {src/wio/images => html/html/images/wio}/https.png | Bin {src/wio/images => html/html/images/wio}/ip.png | Bin .../html/images/wio}/mailgreenoff.png | Bin .../images => html/html/images/wio}/mailgreenon.png | Bin .../images => html/html/images/wio}/mailredoff.png | Bin .../images => html/html/images/wio}/mailredon.png | Bin .../images => html/html/images/wio}/no_graph.png | Bin {src/wio/images => html/html/images/wio}/none.png | Bin {src/wio/images => html/html/images/wio}/orange.png | Bin {src/wio/images => html/html/images/wio}/ovpn.png | Bin .../wio/images => html/html/images/wio}/ovpnn2n.png | Bin {src/wio/images => html/html/images/wio}/ovpnrw.png | Bin {src/wio/images => html/html/images/wio}/red.png | Bin .../wio/images => html/html/images/wio}/refresh.png | Bin {src/wio/images => html/html/images/wio}/vpn.png | Bin {src/wio/images => html/html/images/wio}/vpnn2n.png | Bin {src/wio/images => html/html/images/wio}/vpnrw.png | Bin {src/wio/images => html/html/images/wio}/white.png | Bin 25 files changed, 0 insertions(+), 0 deletions(-) rename {src/wio/images => html/html/images/wio}/add.png (100%) rename {src/wio/images => html/html/images/wio}/back.png (100%) rename {src/wio/images => html/html/images/wio}/blue.png (100%) rename {src/wio/images => html/html/images/wio}/fqdn.png (100%) rename {src/wio/images => html/html/images/wio}/graph.png (100%) rename {src/wio/images => html/html/images/wio}/green.png (100%) rename {src/wio/images => html/html/images/wio}/http.png (100%) rename {src/wio/images => html/html/images/wio}/https.png (100%) rename {src/wio/images => html/html/images/wio}/ip.png (100%) rename {src/wio/images => html/html/images/wio}/mailgreenoff.png (100%) rename {src/wio/images => html/html/images/wio}/mailgreenon.png (100%) rename {src/wio/images => html/html/images/wio}/mailredoff.png (100%) rename {src/wio/images => html/html/images/wio}/mailredon.png (100%) rename {src/wio/images => html/html/images/wio}/no_graph.png (100%) rename {src/wio/images => html/html/images/wio}/none.png (100%) rename {src/wio/images => html/html/images/wio}/orange.png (100%) rename {src/wio/images => html/html/images/wio}/ovpn.png (100%) rename {src/wio/images => html/html/images/wio}/ovpnn2n.png (100%) rename {src/wio/images => html/html/images/wio}/ovpnrw.png (100%) rename {src/wio/images => html/html/images/wio}/red.png (100%) rename {src/wio/images => html/html/images/wio}/refresh.png (100%) rename {src/wio/images => html/html/images/wio}/vpn.png (100%) rename {src/wio/images => html/html/images/wio}/vpnn2n.png (100%) rename {src/wio/images => html/html/images/wio}/vpnrw.png (100%) rename {src/wio/images => html/html/images/wio}/white.png (100%) diff --git a/src/wio/images/add.png b/html/html/images/wio/add.png similarity index 100% rename from src/wio/images/add.png rename to html/html/images/wio/add.png diff --git a/src/wio/images/back.png b/html/html/images/wio/back.png similarity index 100% rename from src/wio/images/back.png rename to html/html/images/wio/back.png diff --git a/src/wio/images/blue.png b/html/html/images/wio/blue.png similarity index 100% rename from src/wio/images/blue.png rename to html/html/images/wio/blue.png diff --git a/src/wio/images/fqdn.png b/html/html/images/wio/fqdn.png similarity index 100% rename from src/wio/images/fqdn.png rename to html/html/images/wio/fqdn.png diff --git a/src/wio/images/graph.png b/html/html/images/wio/graph.png similarity index 100% rename from src/wio/images/graph.png rename to html/html/images/wio/graph.png diff --git a/src/wio/images/green.png b/html/html/images/wio/green.png similarity index 100% rename from src/wio/images/green.png rename to html/html/images/wio/green.png diff --git a/src/wio/images/http.png b/html/html/images/wio/http.png similarity index 100% rename from src/wio/images/http.png rename to html/html/images/wio/http.png diff --git a/src/wio/images/https.png b/html/html/images/wio/https.png similarity index 100% rename from src/wio/images/https.png rename to html/html/images/wio/https.png diff --git a/src/wio/images/ip.png b/html/html/images/wio/ip.png similarity index 100% rename from src/wio/images/ip.png rename to html/html/images/wio/ip.png diff --git a/src/wio/images/mailgreenoff.png b/html/html/images/wio/mailgreenoff.png similarity index 100% rename from src/wio/images/mailgreenoff.png rename to html/html/images/wio/mailgreenoff.png diff --git a/src/wio/images/mailgreenon.png b/html/html/images/wio/mailgreenon.png similarity index 100% rename from src/wio/images/mailgreenon.png rename to html/html/images/wio/mailgreenon.png diff --git a/src/wio/images/mailredoff.png b/html/html/images/wio/mailredoff.png similarity index 100% rename from src/wio/images/mailredoff.png rename to html/html/images/wio/mailredoff.png diff --git a/src/wio/images/mailredon.png b/html/html/images/wio/mailredon.png similarity index 100% rename from src/wio/images/mailredon.png rename to html/html/images/wio/mailredon.png diff --git a/src/wio/images/no_graph.png b/html/html/images/wio/no_graph.png similarity index 100% rename from src/wio/images/no_graph.png rename to html/html/images/wio/no_graph.png diff --git a/src/wio/images/none.png b/html/html/images/wio/none.png similarity index 100% rename from src/wio/images/none.png rename to html/html/images/wio/none.png diff --git a/src/wio/images/orange.png b/html/html/images/wio/orange.png similarity index 100% rename from src/wio/images/orange.png rename to html/html/images/wio/orange.png diff --git a/src/wio/images/ovpn.png b/html/html/images/wio/ovpn.png similarity index 100% rename from src/wio/images/ovpn.png rename to html/html/images/wio/ovpn.png diff --git a/src/wio/images/ovpnn2n.png b/html/html/images/wio/ovpnn2n.png similarity index 100% rename from src/wio/images/ovpnn2n.png rename to html/html/images/wio/ovpnn2n.png diff --git a/src/wio/images/ovpnrw.png b/html/html/images/wio/ovpnrw.png similarity index 100% rename from src/wio/images/ovpnrw.png rename to html/html/images/wio/ovpnrw.png diff --git a/src/wio/images/red.png b/html/html/images/wio/red.png similarity index 100% rename from src/wio/images/red.png rename to html/html/images/wio/red.png diff --git a/src/wio/images/refresh.png b/html/html/images/wio/refresh.png similarity index 100% rename from src/wio/images/refresh.png rename to html/html/images/wio/refresh.png diff --git a/src/wio/images/vpn.png b/html/html/images/wio/vpn.png similarity index 100% rename from src/wio/images/vpn.png rename to html/html/images/wio/vpn.png diff --git a/src/wio/images/vpnn2n.png b/html/html/images/wio/vpnn2n.png similarity index 100% rename from src/wio/images/vpnn2n.png rename to html/html/images/wio/vpnn2n.png diff --git a/src/wio/images/vpnrw.png b/html/html/images/wio/vpnrw.png similarity index 100% rename from src/wio/images/vpnrw.png rename to html/html/images/wio/vpnrw.png diff --git a/src/wio/images/white.png b/html/html/images/wio/white.png similarity index 100% rename from src/wio/images/white.png rename to html/html/images/wio/white.png From patchwork Wed Apr 5 12:28:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6770 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 4Ps3pG41zGz3xD5 for ; Wed, 5 Apr 2023 12:28: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 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 4Ps3p85Dh6z1DQ; Wed, 5 Apr 2023 12:28:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ps3p75jW1z30Kg; Wed, 5 Apr 2023 12:28:47 +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 4Ps3p63DPRz2xxQ for ; Wed, 5 Apr 2023 12:28:46 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ps3p61gs6zdy; Wed, 5 Apr 2023 12:28:46 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680697726; 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=s+Kx6E9hWWERKF2hZzFWSk5tRrCG5nmwG37iS2qOPSM=; b=IKWYmRyNbrwOYOo+Lac23/dfGwIsqMgiDW7Rl5e4x+/MoLn/HqMcctUPSN8/Y3FGtNub79 Am1XE5PCFWUN7pCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680697726; 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=s+Kx6E9hWWERKF2hZzFWSk5tRrCG5nmwG37iS2qOPSM=; b=H5vouoQNqdRnBS36BOIX6xlHJcFmHqjbigSueUDjzl7TEDDRZa2f8U96ByOiH1nAIMDJFF hCaDwVLHEMuXqMQwEG9ujdMlw4iu8XuHoKLHXq1Qa5aOoTP8mg7iR35yILFjahMhjRVtsp RALAxCFmjeh6m4BnmFYNKEciqEitj+XwVqDohhVlj3VBhMfeJQ0mtNqEwNvPOKv+DN0he7 KUBnjRYcrhMIe2f+ITtAT5lav7P3KqUbs2CiyiSCLVQD+WWZLo7kNpiHpG2rrrs0UFayXd kjcToq8Hlnx3BbvSUbW5b+h5plAw45RbXuA7v61P6PDJpwPlGn18vcw1wV58uQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 04/11] wio: relocate wio menu item to standard IPFire location Date: Wed, 5 Apr 2023 14:28:28 +0200 Message-Id: <20230405122835.12821-4-adolf.belka@ipfire.org> In-Reply-To: <20230405122835.12821-1-adolf.belka@ipfire.org> References: <20230405122835.12821-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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: Adolf Belka --- {src/wio => config/menu}/EX-wio.menu | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {src/wio => config/menu}/EX-wio.menu (100%) diff --git a/src/wio/EX-wio.menu b/config/menu/EX-wio.menu similarity index 100% rename from src/wio/EX-wio.menu rename to config/menu/EX-wio.menu From patchwork Wed Apr 5 12:28:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6772 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 4Ps3pH3qYLz3xD5 for ; Wed, 5 Apr 2023 12:28: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 4Ps3p90KShz315; Wed, 5 Apr 2023 12:28:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ps3p762JNz30Ks; Wed, 5 Apr 2023 12:28:47 +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 4Ps3p64kjfz2ynQ for ; Wed, 5 Apr 2023 12:28:46 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ps3p636HkzkF; Wed, 5 Apr 2023 12:28:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680697726; 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=uh2jJJpivccTs1AYW8N1wK2YRxjQOs9VtzQT2IXpLOs=; b=oPQzNeKbVnyaA474rhVx76WG0+8q6vRsVAjjD1PigdOYWBDYWNG1IoX5vrbm0PQxZ/szEy 7DNTJhZK6ncXYdOK2SkojpCFzdyJva3R8/NLw95SD0EIK3L5qe2rLZjtDmFzPzb32Hgh5a 6ocHZSJb1a72r4cPWcK+LUEO4Z9ZqnEzSK1DxzoJtK1BqH+/RwH8cbdoky5k1Szcn3sVcn eJm0jg2eHrS241kYqrLQ9cxXhuDVV7JkZMhdx81kV5JOiK8sI4bRjc5jfyCa1dfvQ23y5l AniRKCtRrNWJOioO6LK8KdaRhIEu/ypazUKXFZBWY9y4qazfUyCannvHkwALLQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680697726; 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=uh2jJJpivccTs1AYW8N1wK2YRxjQOs9VtzQT2IXpLOs=; b=5UcrQErAEeoWGMX2JqjFMsr0V2s3d6bkQtHjTs8lf95ooa2DkqBZpCrA9VCqsk129QA9V4 4E0Y6k+letS2wmAA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 05/11] wio: move cgi files to standard IPFire location Date: Wed, 5 Apr 2023 14:28:29 +0200 Message-Id: <20230405122835.12821-5-adolf.belka@ipfire.org> In-Reply-To: <20230405122835.12821-1-adolf.belka@ipfire.org> References: <20230405122835.12821-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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: Adolf Belka --- {src/wio => html/cgi-bin}/wio.cgi | 0 {src/wio => html/cgi-bin}/wiographs.cgi | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {src/wio => html/cgi-bin}/wio.cgi (100%) rename {src/wio => html/cgi-bin}/wiographs.cgi (100%) diff --git a/src/wio/wio.cgi b/html/cgi-bin/wio.cgi similarity index 100% rename from src/wio/wio.cgi rename to html/cgi-bin/wio.cgi diff --git a/src/wio/wiographs.cgi b/html/cgi-bin/wiographs.cgi similarity index 100% rename from src/wio/wiographs.cgi rename to html/cgi-bin/wiographs.cgi From patchwork Wed Apr 5 12:28:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6775 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 4Ps3pL4gzNz3xD5 for ; Wed, 5 Apr 2023 12:28:58 +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 4Ps3p91S7bz9Qk; Wed, 5 Apr 2023 12:28:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ps3p76MgLz30Jf; Wed, 5 Apr 2023 12:28:47 +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 4Ps3p65yBPz30Hx for ; Wed, 5 Apr 2023 12:28:46 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ps3p64btNzdy; Wed, 5 Apr 2023 12:28:46 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680697726; 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=i8435Ru0f2ZBhdBexZPhv0wfSp5rvZUgki5jQb7ZK4o=; b=H4dZoyN0nw/GflF/zdRGO9BrThKccV66FkPZ1DcunDBYXdTp+i5qEZ5qqJeY/NxrEV0OGh 2buSXFRKjQJ9G+BA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680697726; 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=i8435Ru0f2ZBhdBexZPhv0wfSp5rvZUgki5jQb7ZK4o=; b=pvgWi+joP7ZSCDkjw+tRbrrgKDrbnyIB/aMCwwFWnhW0gnCpqa1bdl7ZrM9z8RNb+ZEzyq Gf0sFTgS03VMi6IMA59CKJK//+L4MG7qpilp7qxTNS9wuaFXbgWhoy9zSJtE8gj7X1e0Xw pcgcgqKWQiakiveDbsQjue19iBneM0k3o6q6AIa1yfF64CTVzM81o+I07jxwxCAhv6yB8z X3LUTFZUJjujjI6mJGwq/43ZnF4kp1ZSqSsVcL1xnGCfuNFcaa7wNCYaulz3VLuxMa079C wtZ9J0FYFmsANMOppIhheyLe+TqqC+CYHXybsDSRnYgDIdVSIEWO3djJ5ZWq+w== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 06/11] wio: move addon language files to standard IPFire location Date: Wed, 5 Apr 2023 14:28:30 +0200 Message-Id: <20230405122835.12821-6-adolf.belka@ipfire.org> In-Reply-To: <20230405122835.12821-1-adolf.belka@ipfire.org> References: <20230405122835.12821-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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" - This location used by guardian addon Signed-off-by: Adolf Belka --- {src/wio/lang => config/wio}/wio.de.pl | 0 {src/wio/lang => config/wio}/wio.en.pl | 0 {src/wio/lang => config/wio}/wio.es.pl | 0 {src/wio/lang => config/wio}/wio.fr.pl | 0 {src/wio/lang => config/wio}/wio.tr.pl | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename {src/wio/lang => config/wio}/wio.de.pl (100%) rename {src/wio/lang => config/wio}/wio.en.pl (100%) rename {src/wio/lang => config/wio}/wio.es.pl (100%) rename {src/wio/lang => config/wio}/wio.fr.pl (100%) rename {src/wio/lang => config/wio}/wio.tr.pl (100%) diff --git a/src/wio/lang/wio.de.pl b/config/wio/wio.de.pl similarity index 100% rename from src/wio/lang/wio.de.pl rename to config/wio/wio.de.pl diff --git a/src/wio/lang/wio.en.pl b/config/wio/wio.en.pl similarity index 100% rename from src/wio/lang/wio.en.pl rename to config/wio/wio.en.pl diff --git a/src/wio/lang/wio.es.pl b/config/wio/wio.es.pl similarity index 100% rename from src/wio/lang/wio.es.pl rename to config/wio/wio.es.pl diff --git a/src/wio/lang/wio.fr.pl b/config/wio/wio.fr.pl similarity index 100% rename from src/wio/lang/wio.fr.pl rename to config/wio/wio.fr.pl diff --git a/src/wio/lang/wio.tr.pl b/config/wio/wio.tr.pl similarity index 100% rename from src/wio/lang/wio.tr.pl rename to config/wio/wio.tr.pl From patchwork Wed Apr 5 12:28:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6773 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 4Ps3pK5XN1z3xD5 for ; Wed, 5 Apr 2023 12:28:57 +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 4Ps3p93D6Gz9S6; Wed, 5 Apr 2023 12:28:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ps3p76kksz2y0s; Wed, 5 Apr 2023 12:28:47 +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 4Ps3p70GPRz30Hx for ; Wed, 5 Apr 2023 12:28:47 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ps3p65prNz2vs; Wed, 5 Apr 2023 12:28:46 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680697726; 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=7lpVSFaBArBxm02guyQVUEYRCpl/PnQQ5jsAJR+caJA=; b=9E65txLRYsnVLzSoi9h+H6Fv6iaO/rGZW5qNg9+4yK/3YIGVP6SqTztf0hiAyjAqxt32hi 1S5XkZZDTDCEGWAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680697726; 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=7lpVSFaBArBxm02guyQVUEYRCpl/PnQQ5jsAJR+caJA=; b=OopSA+0rGtsnKioOP42KAj+2V1lE+V59ubA0G7FtCzV10DgfC78qGsOYBOq+hlAVeyodwp SOw3h6aZGfOgD/ZTXmE949TU26T1n36yHj9hn7fFToyPv5D2ha45D70A5KIMGSqojPb1oU DVAelbQwZgW5Kv35xAb0gs0Anfw8S24XPzkJgHyOa4BdzSC67KdTT1Z3QZ+nmEA/M7yNju ZJ7h38zYKw9EHrdZStX2+m8mhEll4LYYoDy1+Gghhf+GVSQxaNPvfytfIIQLq2RPpzZK++ zYNGQKI/gfGuckI/vpcvg7QUh2oveHD9AWrY+tXV67iaFGWORf8UPvA9lK1VOg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 07/11] wio: move files from src/wio/main/ to standard IPFire location Date: Wed, 5 Apr 2023 14:28:31 +0200 Message-Id: <20230405122835.12821-7-adolf.belka@ipfire.org> In-Reply-To: <20230405122835.12821-1-adolf.belka@ipfire.org> References: <20230405122835.12821-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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: Adolf Belka --- {src/wio/main => config/wio}/wio.conf | 0 {src/wio/main => config/wio}/wio.pl | 0 {src/wio/main => config/wio}/wiovpn.pl | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {src/wio/main => config/wio}/wio.conf (100%) rename {src/wio/main => config/wio}/wio.pl (100%) rename {src/wio/main => config/wio}/wiovpn.pl (100%) diff --git a/src/wio/main/wio.conf b/config/wio/wio.conf similarity index 100% rename from src/wio/main/wio.conf rename to config/wio/wio.conf diff --git a/src/wio/main/wio.pl b/config/wio/wio.pl similarity index 100% rename from src/wio/main/wio.pl rename to config/wio/wio.pl diff --git a/src/wio/main/wiovpn.pl b/config/wio/wiovpn.pl similarity index 100% rename from src/wio/main/wiovpn.pl rename to config/wio/wiovpn.pl From patchwork Wed Apr 5 12:28:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6774 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 4Ps3pL36VNz3xG5 for ; Wed, 5 Apr 2023 12:28:58 +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 4Ps3p93my5z9S3; Wed, 5 Apr 2023 12:28:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ps3p900LMz30JV; Wed, 5 Apr 2023 12:28:49 +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 4Ps3p71QvNz30J0 for ; Wed, 5 Apr 2023 12:28:47 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ps3p7083rzQb; Wed, 5 Apr 2023 12:28:46 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680697727; 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=RCKbooC9Jmj2rJ+qps7UYhBEhHBIUp4LhWHj4hbIU0Q=; b=IhSmlFEkttZIK8Z+dgfeQ/gPX96m7j7KYlhTbgSAEit8HQo0Z9VyTFNUQV1JfbIZxnrimG t2SLJFP1uHW6XUCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680697727; 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=RCKbooC9Jmj2rJ+qps7UYhBEhHBIUp4LhWHj4hbIU0Q=; b=KtDbxdCBpVQxxlxjQX1hzxvco89B9mHEUxZkh0RQKzk/f+7YjpifL20EAhXys7tt1tngJG ZFg09nrlKgHF8sNdOiBg+hNWCNwpyTmYIUoCE9jywsskfFSd5JvMn+L+QRX9HhWAvKNBWE JS6Z3iM4QM2L3/aBzxu+siWccpGtKn0CkjdVDFuWjmr2J5WbvRbtx0MZEelzi31ZRp/zZ8 J5Ne751KarFJtj9sUYp6tXEjNLpi3lGsrPAI81kbYbwvYJqiowWPlUSS3EtO3a5H1tTAdL lcJe7yjYY9z/45euJBAfd16HmmOLie0gVc9R5DbFK2deXqUPmvikh11bLUniuA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 08/11] wio: moved files from src/wio directory to standard IPFire location Date: Wed, 5 Apr 2023 14:28:32 +0200 Message-Id: <20230405122835.12821-8-adolf.belka@ipfire.org> In-Reply-To: <20230405122835.12821-1-adolf.belka@ipfire.org> References: <20230405122835.12821-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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: Adolf Belka --- {src => config}/wio/wio | 0 {src => config}/wio/wio-graphs.pl | 0 {src => config}/wio/wio-lib.pl | 0 {src => config}/wio/wioips | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {src => config}/wio/wio (100%) rename {src => config}/wio/wio-graphs.pl (100%) rename {src => config}/wio/wio-lib.pl (100%) rename {src => config}/wio/wioips (100%) diff --git a/src/wio/wio b/config/wio/wio similarity index 100% rename from src/wio/wio rename to config/wio/wio diff --git a/src/wio/wio-graphs.pl b/config/wio/wio-graphs.pl similarity index 100% rename from src/wio/wio-graphs.pl rename to config/wio/wio-graphs.pl diff --git a/src/wio/wio-lib.pl b/config/wio/wio-lib.pl similarity index 100% rename from src/wio/wio-lib.pl rename to config/wio/wio-lib.pl diff --git a/src/wio/wioips b/config/wio/wioips similarity index 100% rename from src/wio/wioips rename to config/wio/wioips From patchwork Wed Apr 5 12:28:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6776 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 4Ps3pL6Ndnz3xGB for ; Wed, 5 Apr 2023 12:28:58 +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 4Ps3p96Lcqz9SB; Wed, 5 Apr 2023 12:28:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ps3p90JVyz30KN; Wed, 5 Apr 2023 12:28:49 +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 4Ps3p72rxdz30J0 for ; Wed, 5 Apr 2023 12:28:47 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ps3p71J3szdy; Wed, 5 Apr 2023 12:28:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680697727; 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=816dV4l9cVzyychBVyXNbgZsb6FhE+5kH/MDuF1cEZ8=; b=tBcFpdq2WzwwTcJrI/DvQXcmSopQYODgnsvqeq3KRq89O8Bz6ofxeqoP3gYPckBAEl6wid CTo2hfXGVwbTNl8Sj86m2OWlAswJhyjyDFXGfkqJQq78Ou2+kuqQ4zQC8WBTJeNBx7AJhj gO4XdBVysp32AcbFH5gAik43BjLz29AMCsVToecEgtDjbUioQAuFZajYV5DCc1K/XynK1E pzXWMtCgoaGe6D+omITR6gMKaWLfyMCmKD06WT/tNQki8hm4rAmvBpsmJyfpU3aNeXqbpV IgY7/bCGZrksZ20N72zWBNszeZa7JDWUnGsNcK1csP2d+jlid8oauZNUfnXt6g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680697727; 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=816dV4l9cVzyychBVyXNbgZsb6FhE+5kH/MDuF1cEZ8=; b=/Z3/2spxBtlTgMpqvcgApy3+4w9QOQFj3/32qirvO+oEG+nWcgaRcuyAssrvdHOvSRWggK Xzx1WnvCMfSO0JDg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 09/11] wio: add reference to wio menu Date: Wed, 5 Apr 2023 14:28:33 +0200 Message-Id: <20230405122835.12821-9-adolf.belka@ipfire.org> In-Reply-To: <20230405122835.12821-1-adolf.belka@ipfire.org> References: <20230405122835.12821-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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: Adolf Belka --- config/rootfiles/common/configroot | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index bc979cf2c..633bf7211 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -125,6 +125,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-wio.menu #var/ipfire/menu.d/EX-wlanap.menu var/ipfire/modem var/ipfire/modem-lib.pl From patchwork Wed Apr 5 12:28:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6777 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 4Ps3pM2Hfpz3xHC for ; Wed, 5 Apr 2023 12:28:59 +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 4Ps3pB4dKtz9SK; Wed, 5 Apr 2023 12:28:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ps3p90h77z30Kt; Wed, 5 Apr 2023 12:28:49 +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 4Ps3p73zXbz30Jf for ; Wed, 5 Apr 2023 12:28:47 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ps3p72jDqzqC; Wed, 5 Apr 2023 12:28:47 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680697727; 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=pvhUeO1X0j7htDuWv+JukoMpik1lSR76oJJ9lHav6z4=; b=7G9M6+kfs1AfZ86s4mOhoiLBrhUNqH/TqBgMcEVQUTrOynJSdoFB/guuIdFHSWIWs5FzhT +HTLc6j4fpFhw3Ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680697727; 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=pvhUeO1X0j7htDuWv+JukoMpik1lSR76oJJ9lHav6z4=; b=HItSO5d7nQP9okNeAPQIZMfrdlwDEzYklEkOvvx6Cq2vw3qXWEyiMiPuyyFG6kICyxUS6b 8D0tWzYs8mUEoietehOpdzC+Vy2HvKoRok+f1PJLBZlZ8lZINU3jjN9cRtr116DmxpSM5M 0Usz7L3jWAveAvm9q9FEF6VnFyotB5zVEByM7kLzvid4vtTIc2GhoVFIAtO/llZoses0RW QqaeIXWpMv5A5wR5GLpFS/EapIHtA390Utn5soOygVh6MJXOxA5rxMj+cLjJoddRxyZ8Ur SXSvnpjA09EI7itTTu5JU36qmz87EY6c23k0UYnKRZEm70q4PJGL6eNNehxYJQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 10/11] wio: add references to wio cgi and image files Date: Wed, 5 Apr 2023 14:28:34 +0200 Message-Id: <20230405122835.12821-10-adolf.belka@ipfire.org> In-Reply-To: <20230405122835.12821-1-adolf.belka@ipfire.org> References: <20230405122835.12821-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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: Adolf Belka --- config/rootfiles/common/web-user-interface | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 33f0d30a7..52f879d35 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -86,6 +86,8 @@ srv/web/ipfire/cgi-bin/wakeonlan.cgi srv/web/ipfire/cgi-bin/webaccess.cgi srv/web/ipfire/cgi-bin/wireless.cgi srv/web/ipfire/cgi-bin/wirelessclient.cgi +#srv/web/ipfire/cgi-bin/wio.cgi +#srv/web/ipfire/cgi-bin/wiographs.cgi srv/web/ipfire/cgi-bin/wlanap.cgi srv/web/ipfire/cgi-bin/zoneconf.cgi #srv/web/ipfire/html @@ -304,6 +306,32 @@ srv/web/ipfire/html/images/view-fullscreen.png srv/web/ipfire/html/images/view-refresh.png srv/web/ipfire/html/images/wakeup.gif srv/web/ipfire/html/images/window-new.png +srv/web/ipfire/html/images/wio +srv/web/ipfire/html/images/wio/add.png +srv/web/ipfire/html/images/wio/back.png +srv/web/ipfire/html/images/wio/blue.png +srv/web/ipfire/html/images/wio/fqdn.png +srv/web/ipfire/html/images/wio/graph.png +srv/web/ipfire/html/images/wio/green.png +srv/web/ipfire/html/images/wio/http.png +srv/web/ipfire/html/images/wio/https.png +srv/web/ipfire/html/images/wio/ip.png +srv/web/ipfire/html/images/wio/mailgreenoff.png +srv/web/ipfire/html/images/wio/mailgreenon.png +srv/web/ipfire/html/images/wio/mailredoff.png +srv/web/ipfire/html/images/wio/mailredon.png +srv/web/ipfire/html/images/wio/no_graph.png +srv/web/ipfire/html/images/wio/none.png +srv/web/ipfire/html/images/wio/orange.png +srv/web/ipfire/html/images/wio/ovpnn2n.png +srv/web/ipfire/html/images/wio/ovpn.png +srv/web/ipfire/html/images/wio/ovpnrw.png +srv/web/ipfire/html/images/wio/red.png +srv/web/ipfire/html/images/wio/refresh.png +srv/web/ipfire/html/images/wio/vpnn2n.png +srv/web/ipfire/html/images/wio/vpn.png +srv/web/ipfire/html/images/wio/vpnrw.png +srv/web/ipfire/html/images/wio/white.png srv/web/ipfire/html/include srv/web/ipfire/html/include/pakfire.js srv/web/ipfire/html/include/rrdimage.js From patchwork Wed Apr 5 12:28:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6778 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 4Ps3pM5fHQz3xG5 for ; Wed, 5 Apr 2023 12:28:59 +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 4Ps3pB6yd0z9SM; Wed, 5 Apr 2023 12:28:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Ps3p912Rkz30Jc; Wed, 5 Apr 2023 12:28:49 +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 4Ps3p7576pz2y0s for ; Wed, 5 Apr 2023 12:28:47 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Ps3p73r70zQb; Wed, 5 Apr 2023 12:28:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680697727; 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=EdCJ/tJmd5o+1nDjeTmAUUhFLVg9gx+Z6xfHaYSP6Kg=; b=FDpTAHrelULIbbsrDm2fW7WpWionfnxP+EN41/yIKJm9An4+gJAsBcsJvOwNkjynlV19p9 l4JqCoWZAc83jVW+B4e/8dWtiua/hlhYClyMyoUVfyLGJuIiJ20WbPM16cYRoEM/YxV8JT 8ODTxgTFmy0PDLZNqXUTgytv46HVWthZ3vNaLuN400+8+TMwI47gVsBEy2fOfBN1rUbzC+ tm+aCJoKW+Zzdzo5dkM/DFtRruOJLDnVXVPiFtVDYDhDIwv5FuXsHkU2x8vgQcU33EWh1l 8rLA5E/G6JMPzC4Trk/MSg1H8aalpeMl4eXGR/FcNL/G3y+LCovs1ecXkD/1HQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680697727; 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=EdCJ/tJmd5o+1nDjeTmAUUhFLVg9gx+Z6xfHaYSP6Kg=; b=ygiV9w3PkXJ73xDQ71HME1P5tmZ/J1bpfloMUOxUVIDeB6Zl8t1dtk9EAMlW+6dBu9ETjo g5Loc4+waBvoDRAA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 11/11] wio: remove unneeded or incorrect commands Date: Wed, 5 Apr 2023 14:28:35 +0200 Message-Id: <20230405122835.12821-11-adolf.belka@ipfire.org> In-Reply-To: <20230405122835.12821-1-adolf.belka@ipfire.org> References: <20230405122835.12821-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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" - the helper programs in misc-progs get the correct permissions and ownerships automatically so adjustment not required in this script. - permissions of menus in menu.d are provided automatically. Historically, these were root:root but were changed a while back but did not get applied to wio as it was modified by this script. Signed-off-by: Adolf Belka --- src/paks/wio/install.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/paks/wio/install.sh b/src/paks/wio/install.sh index 220378141..6b2798b78 100644 --- a/src/paks/wio/install.sh +++ b/src/paks/wio/install.sh @@ -27,11 +27,5 @@ restore_backup ${NAME} chown -R nobody.nobody /var/ipfire/wio chown -R nobody.nobody /var/log/wio -chown root.nobody /usr/local/bin/wioscan -chown root.nobody /usr/local/bin/wiohelper -chown nobody.nobody /var/ipfire/menu.d/EX-wio.menu - -chmod 4750 /usr/local/bin/wioscan -chmod 4750 /usr/local/bin/wiohelper /usr/local/bin/update-lang-cache