From 213caecd151c713e257a52958559fe51f4c94483 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Wed, 14 May 2008 19:41:40 +0000
Subject: [PATCH] * modules/freifunk: Cleaned up Freifunk init-Script and
 wizard

---
 modules/freifunk/root/etc/init.d/luci_freifunk     | 91 ----------------------
 .../src/model/cbi/admin_index/freifunk.lua         |  4 -
 .../src/view/admin_index/wizard.htm                |  0
 3 files changed, 95 deletions(-)
 delete mode 100644 modules/freifunk/root/etc/init.d/luci_freifunk
 rename modules/{admin-core => freifunk}/src/view/admin_index/wizard.htm (100%)

diff --git a/modules/freifunk/root/etc/init.d/luci_freifunk b/modules/freifunk/root/etc/init.d/luci_freifunk
deleted file mode 100644
index 38779cb8b..000000000
--- a/modules/freifunk/root/etc/init.d/luci_freifunk
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=70
-
-start() {
-	include /lib/network
-	scan_interfaces
-	
-	
-	### Read interface names
-	config_get wanif wan ifname
-	config_get lanif lan ifname
-	config_get ffif  ff  ifname
-	config_get ffdif ffdhcp  ifname
-	
-	config_get lanip   lan ipaddr
-	config_get lanmask lan netmask
-	
-	config_get ffip    ff ipaddr
-	config_get ffmask  ff netmask
-	
-	config_get ffdip   ffdhcp ipaddr
-	config_get ffdmask ffdhcp netmask
-	
-	[ -n "$ffif" ] || return 0
-	
-	
-	### Creating chains
-	iptables -N luci_freifunk_forwarding
-	iptables -t nat -N luci_freifunk_postrouting
-		
-	
-	### Read from config
-	config_load freifunk
-	
-	config_get_bool internal routing internal
-	[ -n "$wanif" ] && config_get_bool internet routing internet
-	
-	
-	### Freifunk to Freifunk
-	[ "$internal" -gt 0 ] && {
-		iptables -A luci_freifunk_forwarding -i "$ffif" -o "$ffif" -j ACCEPT
-	}
-	
-	### Freifunk DHCP to Freifunk
-	[ "$internal" -gt 0 -a -n "$ffdif" ] && {
-		eval "$(ipcalc.sh $ffdip $ffdmask)"
-		
-		iptables -t nat -A luci_freifunk_postrouting -s "$NETWORK/$PREFIX" -o "$ffif" -j MASQUERADE
-	}
-	
-	### Lan to Freifunk	
-	[ -n "$lanif" ] && {
-		eval "$(ipcalc.sh $lanip $lanmask)"
-		
-		iptables -A luci_freifunk_forwarding -i "$lanif" -o "$ffif" -j ACCEPT
-		iptables -t nat -A luci_freifunk_postrouting -s "$NETWORK/$PREFIX" -o "$ffif" -j MASQUERADE
-	}
-	
-	### Freifunk to Wan
-	[ "$internet" -gt 0 ] && {		
-		eval "$(ipcalc.sh $ffip $ffmask)"		
-		
-		iptables -A luci_freifunk_forwarding -i "$ffif" -o "$wanif" -j ACCEPT
-		iptables -t nat -A luci_freifunk_postrouting -s "$NETWORK/$PREFIX" -o "$wanif" -j MASQUERADE
-	}
-	
-	### Freifunk DHCP to Wan
-	[ "$internet" -gt 0 -a -n "$ffdif" ] && {		
-		eval "$(ipcalc.sh $ffdip $ffdmask)"		
-		
-		iptables -t nat -A luci_freifunk_postrouting -s "$NETWORK/$PREFIX" -o "$wanif" -j MASQUERADE
-	}
-	
-	### Hook in the chains
-	iptables -A forwarding_rule -j luci_freifunk_forwarding
-	iptables -t nat -A postrouting_rule -j luci_freifunk_postrouting
-}
-
-stop() {
-	### Hook out the chains
-	iptables -D forwarding_rule -j luci_freifunk_forwarding
-	iptables -t nat -D postrouting_rule -j luci_freifunk_postrouting
-	
-	### Clear the chains
-	iptables -F luci_freifunk_forwarding
-	iptables -t nat -F luci_freifunk_postrouting
-	
-	### Delete chains
-	iptables -X luci_freifunk_forwarding
-	iptables -t nat -X luci_freifunk_postrouting
-}
diff --git a/modules/freifunk/src/model/cbi/admin_index/freifunk.lua b/modules/freifunk/src/model/cbi/admin_index/freifunk.lua
index ec4d100b8..fe9e285b4 100644
--- a/modules/freifunk/src/model/cbi/admin_index/freifunk.lua
+++ b/modules/freifunk/src/model/cbi/admin_index/freifunk.lua
@@ -1,10 +1,6 @@
 -- Todo: Translate
 m = Map("freifunk", "Freifunk")
 
-s = m:section(NamedSection, "routing", "settings", "Netzverkehr")
-s:option(Flag, "internal", "Freifunk zulassen", "immer aktivieren!")
-s:option(Flag, "internet", "Internet zulassen")
-
 c = m:section(NamedSection, "community", "public", "Gemeinschaft", [[Dies sind die Grundeinstellungen
 für die lokale Freifunkgemeinschaft. Diese Werte wirken sich NICHT auf die Konfiguration
 des Routers aus, sondern definieren nur die Vorgaben für den Freifunkassistenten.]])
diff --git a/modules/admin-core/src/view/admin_index/wizard.htm b/modules/freifunk/src/view/admin_index/wizard.htm
similarity index 100%
rename from modules/admin-core/src/view/admin_index/wizard.htm
rename to modules/freifunk/src/view/admin_index/wizard.htm
-- 
2.11.0