From: "Peter Müller" <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 745fd50e66b023fbac8ead685c41cb1d2a84ef20
Date: Thu, 18 May 2023 09:48:58 +0000 [thread overview]
Message-ID: <4QMQCv04SYz2xyV@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 23178 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 745fd50e66b023fbac8ead685c41cb1d2a84ef20 (commit)
via f9e2cd1c0bce28a8251f68826b19da3e680ab4b4 (commit)
via b6b59014a37ecdab3a70576fca18e29abd0b8f91 (commit)
via b1584da093f6d2f0387e9e73d4653ce1eb45192b (commit)
via 1ee6f37fb430eb0d5a690b97634209251824a833 (commit)
via b637cb23c808286812bceeff814e2ccaba006c5d (commit)
via 5a6134e2a6e4ae9fdf15a37fcfddd08be33c0c39 (commit)
via 1d666a6b3b34da736565cbd89e648f689261365f (commit)
via 4e908f84c7c27596d966d009784ea937f6b82416 (commit)
via addb1b2fe15235e5b3be11042c054228837b7f48 (commit)
via 21d0be64d973a9fef5225f3ef12c8a17d1530d0a (commit)
from e8a73cfe948a45b1d34224acacf629a61ed17b0d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 745fd50e66b023fbac8ead685c41cb1d2a84ef20
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Apr 5 14:28:35 2023 +0200
wio: remove unneeded or incorrect commands
- 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 <adolf.belka(a)ipfire.org>
commit f9e2cd1c0bce28a8251f68826b19da3e680ab4b4
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Apr 5 14:28:34 2023 +0200
wio: add references to wio cgi and image files
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit b6b59014a37ecdab3a70576fca18e29abd0b8f91
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Apr 5 14:28:33 2023 +0200
wio: add reference to wio menu
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit b1584da093f6d2f0387e9e73d4653ce1eb45192b
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Apr 5 14:28:32 2023 +0200
wio: moved files from src/wio directory to standard IPFire location
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 1ee6f37fb430eb0d5a690b97634209251824a833
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Apr 5 14:28:31 2023 +0200
wio: move files from src/wio/main/ to standard IPFire location
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit b637cb23c808286812bceeff814e2ccaba006c5d
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Apr 5 14:28:30 2023 +0200
wio: move addon language files to standard IPFire location
- This location used by guardian addon
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 5a6134e2a6e4ae9fdf15a37fcfddd08be33c0c39
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Apr 5 14:28:29 2023 +0200
wio: move cgi files to standard IPFire location
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 1d666a6b3b34da736565cbd89e648f689261365f
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Apr 5 14:28:28 2023 +0200
wio: relocate wio menu item to standard IPFire location
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 4e908f84c7c27596d966d009784ea937f6b82416
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Apr 5 14:28:27 2023 +0200
wio: images moved to standard IPFire location
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit addb1b2fe15235e5b3be11042c054228837b7f48
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Apr 5 14:28:26 2023 +0200
wio: Move backup/includes file to standard IPFire location
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 21d0be64d973a9fef5225f3ef12c8a17d1530d0a
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Wed Apr 5 14:28:25 2023 +0200
wio: This is a patch series relocating wio into the standard ipfire directories
- 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 <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
{src/wio/config => config}/backup/includes/wio | 0
{src/wio => config/menu}/EX-wio.menu | 0
config/rootfiles/common/configroot | 1 +
config/rootfiles/common/web-user-interface | 28 ++++++++++++++
{src => config}/wio/wio | 0
{src => config}/wio/wio-graphs.pl | 0
{src => config}/wio/wio-lib.pl | 0
{src/wio/main => config/wio}/wio.conf | 0
{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/main => config/wio}/wio.pl | 0
{src/wio/lang => config/wio}/wio.tr.pl | 0
{src => config}/wio/wioips | 0
{src/wio/main => config/wio}/wiovpn.pl | 0
{src/wio => html/cgi-bin}/wio.cgi | 0
{src/wio => html/cgi-bin}/wiographs.cgi | 0
{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
.../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
.../wio/images => html/html/images/wio}/orange.png | Bin
{src/wio/images => html/html/images/wio}/ovpn.png | Bin
.../images => html/html/images/wio}/ovpnn2n.png | Bin
.../wio/images => html/html/images/wio}/ovpnrw.png | Bin
{src/wio/images => html/html/images/wio}/red.png | Bin
.../images => html/html/images/wio}/refresh.png | Bin
{src/wio/images => html/html/images/wio}/vpn.png | Bin
.../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
lfs/wio | 41 ++++++++++-----------
src/paks/wio/install.sh | 6 ---
45 files changed, 48 insertions(+), 28 deletions(-)
rename {src/wio/config => config}/backup/includes/wio (100%)
rename {src/wio => config/menu}/EX-wio.menu (100%)
rename {src => config}/wio/wio (100%)
rename {src => config}/wio/wio-graphs.pl (100%)
rename {src => config}/wio/wio-lib.pl (100%)
rename {src/wio/main => config/wio}/wio.conf (100%)
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/main => config/wio}/wio.pl (100%)
rename {src/wio/lang => config/wio}/wio.tr.pl (100%)
rename {src => config}/wio/wioips (100%)
rename {src/wio/main => config/wio}/wiovpn.pl (100%)
rename {src/wio => html/cgi-bin}/wio.cgi (100%)
rename {src/wio => html/cgi-bin}/wiographs.cgi (100%)
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%)
Difference in files:
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
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
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 84b3f4b1e..b920dd248 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-wio.menu
#var/ipfire/menu.d/EX-wlanap.menu
var/ipfire/modem
var/ipfire/modem-lib.pl
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
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/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/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/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/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
diff --git a/src/wio/wioips b/config/wio/wioips
similarity index 100%
rename from src/wio/wioips
rename to config/wio/wioips
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
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
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
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)
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
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2023-05-18 9:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4QMQCv04SYz2xyV@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox