packages: clean up uci-defaults, add missing guards

- Remove redundant freifunk-olsrv1 script - Remove freifunk script, move its contents to uhttpd - Add guards for network, pingcheck, wireless Signed-off-by: Packet Please <[email protected]>
freifunk-berlin · Jul 12, 2023 · 1c36858 · 1c36858
1 parent 88c692a
commit 1c36858
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/packages/falter-common/files/etc/uci-defaults/freifunk b/packages/falter-common/files/etc/uci-defaults/freifunk
diff --git a/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-pingcheck-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-pingcheck-defaults
@@ -4,6 +4,9 @@
 
 . /lib/functions.sh
 
+. /lib/functions/guard.sh
+guard "network"
+
 # remove the sta interface, leaving only wan
 uci del pingcheck.@interface\[1\]
 

diff --git a/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-uhttpd-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-uhttpd-defaults
@@ -11,6 +11,12 @@ guard "uhttpd"
 uci set uhttpd.px5g.commonname="Freifunk Berlin - $(dd if=/dev/urandom bs=4 count=1 | hexdump -e '1/1 "%02x"')"
 # do force redirect to https for encrypted web interface
 uci set uhttpd.main.redirect_https=1
+
+# Disable filtering requests from RFC1918 IP addresses.
+# This is a DNS rebinding countermeasure that we don't want,
+# since we use the 10.0.0.0/8 space for OLSR meshing.
+uci set uhttpd.main.rfc1918_filter=0
+
 uci commit
 
 service uhttpd reload
diff --git a/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-wireless-defaults b/packages/falter-common/files/etc/uci-defaults/freifunk-berlin-wireless-defaults
@@ -12,6 +12,9 @@
 . /lib/config/uci.sh
 . /lib/functions/system.sh
 
+. /lib/functions/guard.sh
+guard "wireless"
+
 mac_addr=$(get_mac_label | cut -c 10-)
 
 if [ -z "$mac_addr" ]; then

diff --git a/packages/falter-common/files/etc/uci-defaults/freifunk-olsrv1 b/packages/falter-common/files/etc/uci-defaults/freifunk-olsrv1