From e50cb9d7d900dc0d87127c89156c9a0d52517ae4 Mon Sep 17 00:00:00 2001 From: Christian Dresel Date: Sun, 27 Dec 2020 01:03:35 +0100 Subject: [PATCH] Add package fff-web-autol3 With this package, the autol3 configuration can make over the webui Signed-off-by: Christian Dresel sq --- src/packages/fff/fff-layer3/Makefile | 1 + src/packages/fff/fff-web-autol3/Makefile | 33 +++++ .../files/www/menu/ssl/16-autol3 | 1 + .../files/www/ssl/cgi-bin/autol3.html | 128 ++++++++++++++++++ 4 files changed, 163 insertions(+) create mode 100644 src/packages/fff/fff-web-autol3/Makefile create mode 100644 src/packages/fff/fff-web-autol3/files/www/menu/ssl/16-autol3 create mode 100644 src/packages/fff/fff-web-autol3/files/www/ssl/cgi-bin/autol3.html diff --git a/src/packages/fff/fff-layer3/Makefile b/src/packages/fff/fff-layer3/Makefile index 8bbff5e5..56ff3fa6 100644 --- a/src/packages/fff/fff-layer3/Makefile +++ b/src/packages/fff/fff-layer3/Makefile @@ -19,6 +19,7 @@ define Package/fff-layer3 +fff-layer3-config \ +fff-network \ +fff-ra \ + +fff-web-autol3 \ +fff-wireguard \ +arptables \ +bmon \ diff --git a/src/packages/fff/fff-web-autol3/Makefile b/src/packages/fff/fff-web-autol3/Makefile new file mode 100644 index 00000000..babebebf --- /dev/null +++ b/src/packages/fff/fff-web-autol3/Makefile @@ -0,0 +1,33 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=fff-web-autol3 +PKG_RELEASE:=1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-web-autol3 + +include $(INCLUDE_DIR)/package.mk + +define Package/fff-web-autol3 + SECTION:=base + CATEGORY:=Freifunk + TITLE:=Freifunk-Franken layer3 autol3 webui + URL:=https://www.freifunk-franken.de + DEPENDS:= \ + +fff-autol3 \ + +fff-web-ui + +endef + +define Package/fff-web-autol3/description + Webui for autol3 +endef + +define Build/Compile + # nothing +endef + +define Package/fff-web-autol3/install + $(CP) ./files/* $(1)/ +endef + +$(eval $(call BuildPackage,fff-web-autol3)) diff --git a/src/packages/fff/fff-web-autol3/files/www/menu/ssl/16-autol3 b/src/packages/fff/fff-web-autol3/files/www/menu/ssl/16-autol3 new file mode 100644 index 00000000..ec6da190 --- /dev/null +++ b/src/packages/fff/fff-web-autol3/files/www/menu/ssl/16-autol3 @@ -0,0 +1 @@ +autol3,Automatische Layer 3 Einstellungen diff --git a/src/packages/fff/fff-web-autol3/files/www/ssl/cgi-bin/autol3.html b/src/packages/fff/fff-web-autol3/files/www/ssl/cgi-bin/autol3.html new file mode 100644 index 00000000..460b244d --- /dev/null +++ b/src/packages/fff/fff-web-autol3/files/www/ssl/cgi-bin/autol3.html @@ -0,0 +1,128 @@ +#!/usr/bin/haserl + +<%in /www/include/header %> +<%in /www/include/helpers %> +<% show_msg %> + +<% + +if [ -n "${POST_save}" ] ; then + if [ -n "${POST_autol3v4}" ] ; then + uci set fff.autol3.ipv4=1 + else + uci del fff.autol3.ipv4 + fi + if [ -n "${POST_autol3v6}" ] ; then + uci set fff.autol3.ipv6=1 + else + uci del fff.autol3.ipv6 + fi + uci commit fff +fi +if [ $(uci -q get fff.autol3.ipv6) ] ; then + autol3v6="checked" +fi +if [ $(uci -q get fff.autol3.ipv4) ] ; then + autol3v4="checked" +fi +ASSIGNER6OWN=$(uci -q get fff.autol3.ipv6assigner) +IP6OWN=$(uci -q get fff.autol3.ipv6address) +ASSIGNER4OWN=$(uci -q get fff.autol3.ipv4assigner) +IP4OWN=$(uci -q get fff.autol3.ipv4address) + +if [ -n "${POST_blockv6}" ] ; then + uci add_list fff.autol3.ipv6assignerblock=$ASSIGNER6OWN + uci commit fff +fi +if [ -n "${POST_blockv4}" ] ; then + uci add_list fff.autol3.ipv4assignerblock=$ASSIGNER6OWN + uci commit fff +fi + +if [ -n "${POST_reloadv4}" ] ; then + uci del fff.autol3.ipv4address + uci del fff.autol3.ipv4assigner + uci commit fff + autov4 +fi +if [ -n "${POST_reloadv6}" ] ; then + uci del fff.autol3.ipv6address + uci del fff.autol3.ipv6assigner + uci commit fff + autov6 +fi + +if [ -n "${POST_removev6block}" ] ; then + uci del_list fff.autol3.ipv6assignerblock=${POST_blockv6} + uci commit fff +fi +if [ -n "${POST_removev4block}" ] ; then + uci del_list fff.autol3.ipv4assignerblock=${POST_blockv4} + uci commit fff +fi +%> + +
+ +
+ AutoL3 + + + +
IPv4 Adresse automatisch beziehen:>Wenn du diesen Haken setzt, wird automatisch eine IPv4 Adresse bezogen und NAT aktiviert
IPv6 Adresse automatisch beziehen:>bla
+
+ +
+
+ + + + + + +
+
+ IPv6 Konfiguration + + + +
Assigner:<%= $ASSIGNER6OWN %>
IP-Adresse:<%= $IP6OWN %>
+ + +
+
+
+ IPv4 Konfiguration + + + +
Assigner:<%= $ASSIGNER4OWN %>
IP-Adresse:<%= $IP4OWN %>
+ + +
+
+
+ IPv6 Blockliste + + <% + ipv6assignerblock=$(uci get fff.autol3.ipv6assignerblock) + for ipv6assignerblock in $ipv6assignerblock; do + echo "" + done + %> +
"$ipv6assignerblock":
+
+
+
+ IPv4 Blockliste + + <% + ipv4assignerblock=$(uci get fff.autol3.ipv4assignerblock) + for ipv4assignerblock in $ipv4assignerblock; do + echo "" + done + %> +
"$ipv4assignerblock":
+
+
+<%in /www/include/footer %>