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)