Reorganised Freifunk pages

Unified Community configuration

18 files changed, 57 insertions, 108 deletions

diff --git a/applications/community-augsburg/ipkg/postinst b/applications/community-augsburg/ipkg/postinst
deleted file mode 100644
index b99b7c17c..000000000
--- a/applications/community-augsburg/ipkg/postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -n "${IPKG_INSTROOT}" ] || {
-	( . /etc/uci-defaults/luci-community-augsburg ) &&	rm -f /etc/uci-defaults/luci-community-augsburg
-}
diff --git a/applications/community-augsburg/root/etc/uci-defaults/luci-community-augsburg b/applications/community-augsburg/root/etc/uci-defaults/luci-community-augsburg
deleted file mode 100644
index b1efd46de..000000000
--- a/applications/community-augsburg/root/etc/uci-defaults/luci-community-augsburg
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-uci batch <<-EOF
-        set freifunk.community.name='Freifunk Augsburg'
-        set freifunk.community.homepage=http://augsburg.freifunk.net
-        set freifunk.community.essid=augsburg.freifunk.net
-        set freifunk.community.bssid=02:CA:FF:EE:BA:BE
-        set freifunk.community.channel=1
-        set freifunk.community.net=191.161.0.0
-        set freifunk.community.mask=255.255.0.0
-        set freifunk.community.dns='88.198.178.18 141.54.1.1 212.204.49.83 208.67.220.220 208.67.222.222'
-        set luci.main.mediaurlbase=/luci-static/fledermaus
-        set luci.main.lang=de
-        commit freifunk
-        commit luci
-EOF
-	
diff --git a/applications/community-berlin/Makefile b/applications/community-berlin/Makefile
deleted file mode 100644
index 81a96f6a8..000000000
--- a/applications/community-berlin/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/applications/community-berlin/ipkg/postinst b/applications/community-berlin/ipkg/postinst
deleted file mode 100755
index ad5e96c3e..000000000
--- a/applications/community-berlin/ipkg/postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -n "${IPKG_INSTROOT}" ] || {
-	( . /etc/uci-defaults/luci-community-berlin ) &&	rm -f /etc/uci-defaults/luci-community-berlin
-}
diff --git a/applications/community-berlin/root/etc/uci-defaults/luci-community-berlin b/applications/community-berlin/root/etc/uci-defaults/luci-community-berlin
deleted file mode 100644
index 348b0c8e9..000000000
--- a/applications/community-berlin/root/etc/uci-defaults/luci-community-berlin
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-uci batch <<-EOF
-        set freifunk.community.name='Freifunk Berlin'
-        set freifunk.community.homepage=http://berlin.freifunk.net
-        set freifunk.community.essid=olsr.freifunk.net
-        set freifunk.community.bssid=02:CA:FF:EE:BA:BE
-        set freifunk.community.channel=10
-        set freifunk.community.net=104.0.0.0
-        set freifunk.community.mask=255.0.0.0
-        set freifunk.community.dns='88.198.178.18 141.54.1.1 212.204.49.83 208.67.220.220 208.67.222.222'
-        set luci.main.mediaurlbase=/luci-static/fledermaus
-        set luci.main.lang=de
-        commit freifunk
-        commit luci
-EOF
-	
diff --git a/applications/community-halle/Makefile b/applications/community-halle/Makefile
deleted file mode 100644
index 81a96f6a8..000000000
--- a/applications/community-halle/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/applications/community-halle/ipkg/postinst b/applications/community-halle/ipkg/postinst
deleted file mode 100755
index 0efb5a9a7..000000000
--- a/applications/community-halle/ipkg/postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -n "${IPKG_INSTROOT}" ] || {
-	( . /etc/uci-defaults/luci-community-halle ) &&	rm -f /etc/uci-defaults/luci-community-halle
-}
diff --git a/applications/community-hannover/Makefile b/applications/community-hannover/Makefile
deleted file mode 100644
index 81a96f6a8..000000000
--- a/applications/community-hannover/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/applications/community-hannover/ipkg/postinst b/applications/community-hannover/ipkg/postinst
deleted file mode 100755
index b41179f72..000000000
--- a/applications/community-hannover/ipkg/postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -n "${IPKG_INSTROOT}" ] || {
-	( . /etc/uci-defaults/luci-community-hannover ) &&	rm -f /etc/uci-defaults/luci-community-hannover
-}
diff --git a/applications/community-hannover/root/etc/uci-defaults/luci-community-hannover b/applications/community-hannover/root/etc/uci-defaults/luci-community-hannover
deleted file mode 100644
index b9ae37292..000000000
--- a/applications/community-hannover/root/etc/uci-defaults/luci-community-hannover
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-uci batch <<-EOF
-        set freifunk.community.name='Freifunk Hannover'
-        set freifunk.community.homepage=http://www.freifunk-hannover.de
-        set freifunk.community.essid=hannover.freifunk.net
-        set freifunk.community.bssid=CA:FF:EE:CA:FF:EE
-        set freifunk.community.realm=db.freifunk-hannover.de
-        set freifunk.community.channel=1
-        set freifunk.community.net=10.2.0.0
-        set freifunk.community.mask=255.255.0.0
-        set luci.main.mediaurlbase=/luci-static/fledermaus
-        set luci.main.lang=de
-        commit freifunk
-        commit luci
-EOF
-	
diff --git a/applications/community-leipzig/Makefile b/applications/community-leipzig/Makefile
deleted file mode 100644
index 81a96f6a8..000000000
--- a/applications/community-leipzig/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/applications/community-leipzig/ipkg/postinst b/applications/community-leipzig/ipkg/postinst
deleted file mode 100755
index 5aff5db95..000000000
--- a/applications/community-leipzig/ipkg/postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -n "${IPKG_INSTROOT}" ] || {
-	( . /etc/uci-defaults/luci-community-leipzig ) &&	rm -f /etc/uci-defaults/luci-community-leipzig
-}
diff --git a/applications/community-leipzig/root/etc/uci-defaults/luci-community-leipzig b/applications/community-leipzig/root/etc/uci-defaults/luci-community-leipzig
deleted file mode 100644
index ca07f18d3..000000000
--- a/applications/community-leipzig/root/etc/uci-defaults/luci-community-leipzig
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-uci batch <<-EOF
-        set luci.main.mediaurlbase=/luci-static/fledermaus
-        set luci.main.lang=de
-        commit luci
-EOF
-	
\ No newline at end of file
diff --git a/applications/community-augsburg/Makefile b/applications/freifunk-community/Makefile
index 81a96f6a8..81a96f6a8 100644
--- a/applications/community-augsburg/Makefile
+++ b/applications/freifunk-community/Makefile
diff --git a/applications/freifunk-community/ipkg/postinst b/applications/freifunk-community/ipkg/postinst
new file mode 100755
index 000000000..c16bc3af4
--- /dev/null
+++ b/applications/freifunk-community/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-freifunk-community ) &&	rm -f /etc/uci-defaults/luci-freifunk-community
+}
diff --git a/applications/community-halle/root/etc/uci-defaults/luci-community-halle b/applications/freifunk-community/root/etc/uci-defaults/luci-freifunk-community
index d6d40f028..d6d40f028 100644
--- a/applications/community-halle/root/etc/uci-defaults/luci-community-halle
+++ b/applications/freifunk-community/root/etc/uci-defaults/luci-freifunk-community
diff --git a/applications/luci-ffwizard-leipzig/luasrc/controller/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/controller/ffwizard.lua
index 9e7c0deca..9a9f883ef 100644
--- a/applications/luci-ffwizard-leipzig/luasrc/controller/ffwizard.lua
+++ b/applications/luci-ffwizard-leipzig/luasrc/controller/ffwizard.lua
@@ -17,5 +17,5 @@ $Id$
 module "luci.controller.ffwizard"
 
 function index()
-	entry({"admin", "index", "ffwizard"}, form("ffwizard"), "Freifunkassistent", 50)
+	entry({"admin", "freifunk", "ffwizard"}, form("ffwizard"), "Freifunkassistent", 50)
 end
\ No newline at end of file
diff --git a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
index afde3fdf9..6243acac5 100644
--- a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
+++ b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
@@ -17,6 +17,7 @@ $Id$
 
 local uci = require "luci.model.uci".cursor()
 local tools = require "luci.tools.ffwizard"
+local util = require "luci.util"
 
 
 -------------------- View --------------------
@@ -33,11 +34,11 @@ uci:foreach("wireless", "wifi-device",
 
 main = f:field(Flag, "wifi", "Freifunkzugang einrichten")
 
-net = f:field(Value, "net", "Freifunknetz")
+net = f:field(Value, "net", "Freifunknetz", "1. Teil der IP-Adresse")
 net.rmempty = true
 net:depends("wifi", "1")
 uci:foreach("freifunk", "community", function(s)
-	net:value(s[".name"], s.name)
+	net:value(s[".name"], "%s (%s)" % {s.name, s.prefix})
 end)
 
 function net.cfgvalue(self, section)
@@ -49,7 +50,7 @@ function net.write(self, section, value)
 end
 
 
-subnet = f:field(Value, "subnet", "Subnetz (Projekt)")
+subnet = f:field(Value, "subnet", "Subnetz (Projekt)", "2. Teil der IP-Adresse")
 subnet.rmempty = true
 subnet:depends("wifi", "1")
 function subnet.cfgvalue(self, section)
@@ -60,7 +61,7 @@ function subnet.write(self, section, value)
 	uci:save("freifunk")
 end
 
-node = f:field(Value, "node", "Knoten")
+node = f:field(Value, "node", "Knoten", "3. Teil der IP-Adresse")
 node.rmempty = true
 node:depends("wifi", "1")
 for i=1, 51 do
@@ -76,14 +77,27 @@ end
 
 client = f:field(Flag, "client", "WLAN-DHCP anbieten")
 client:depends("wifi", "1")
+client.rmempty = true
+function client.cfgvalue(self, section)
+	return uci:get("freifunk", "wizard", "client")
+end
+function client.write(self, section, value)
+	uci:set("freifunk", "wizard", "client", value)
+	uci:save("freifunk")
+end
 
 
 olsr = f:field(Flag, "olsr", "OLSR einrichten")
 
-share = f:field(ListValue, "sharenet", "Eigenen Internetzugang freigeben")
-share:value("maybe", "-- keine Aktion --")
-share:value("yes", "einschalten")
-share:value("no", "ausschalten")
+share = f:field(Flag, "sharenet", "Eigenen Internetzugang freigeben")
+share.rmempty = true
+function share.cfgvalue(self, section)
+	return uci:get("freifunk", "wizard", "sharenet")
+end
+function share.write(self, section, value)
+	uci:set("freifunk", "wizard", "sharenet", value)
+	uci:save("freifunk")
+end
 
 
 
@@ -115,7 +129,7 @@ function main.write(self, section, value)
 	end
 
 	local device = dev:formvalue(section)
-	local community
+	local community, external
 
 	-- Collect IP-Address
 	local inet = net:formvalue(section)
@@ -127,6 +141,7 @@ function main.write(self, section, value)
 		net.tag_missing[section] = true
 	else
 		community = inet
+		external  = uci:get("freifunk", community, "external") or ""
 		inet = uci:get("freifunk", community, "prefix") or inet
 	end
 	if not isubnet then
@@ -154,11 +169,13 @@ function main.write(self, section, value)
 	end
 
 	-- Tune wifi device
-	local devconfig = _strip_internals(uci:get_all("freifunk", "wifi_device"))
+	local devconfig = uci:get_all("freifunk", "wifi_device")
+	util.update(devconfig, uci:get_all(external, "wifi_device") or {})
 	uci:tset("wireless", device, devconfig)
 
 	-- Create wifi iface
-	local ifconfig = _strip_internals(uci:get_all("freifunk", "wifi_iface"))
+	local ifconfig = uci:get_all("freifunk", "wifi_iface")
+	util.update(ifconfig, uci:get_all(external, "wifi_iface") or {})
 	ifconfig.device = device
 	ifconfig.network = device
 	ifconfig.ssid = uci:get("freifunk", community, "ssid")
@@ -171,11 +188,17 @@ function main.write(self, section, value)
 	local newzone = tools.firewall_create_zone("freifunk", "DROP", "ACCEPT", "DROP", true)
 	if newzone then
 		uci:foreach("freifunk", "fw_forwarding", function(section)
-			uci:section("firewall", "forwarding", nil, _strip_internals(section))
+			uci:section("firewall", "forwarding", nil, section)
+		end)
+		uci:foreach(external, "fw_forwarding", function(section)
+			uci:section("firewall", "forwarding", nil, section)
 		end)
 
 		uci:foreach("freifunk", "fw_rule", function(section)
-			uci:section("firewall", "rule", nil, _strip_internals(section))
+			uci:section("firewall", "rule", nil, section)
+		end)
+		uci:foreach(external, "fw_rule", function(section)
+			uci:section("firewall", "rule", nil, section)
 		end)
 
 		uci:save("firewall")
@@ -183,7 +206,8 @@ function main.write(self, section, value)
 
 
 	-- Crate network interface
-	local netconfig = _strip_internals(uci:get_all("freifunk", "interface"))
+	local netconfig = uci:get_all("freifunk", "interface")
+	util.update(netconfig, uci:get_all(external, "interface") or {})
 	netconfig.proto = "static"
 	netconfig.ipaddr = ip
 	uci:section("network", "interface", device, netconfig)
@@ -199,13 +223,18 @@ function olsr.write(self, section, value)
 		return
 	end
 
+
 	local device = dev:formvalue(section)
+	
+	local community = net:formvalue(section)
+	local external  = community and uci:get("freifunk", community, "external") or ""
 
 	-- Delete old interface
 	uci:delete_all("freifunk", "Interface", {Interface=device})
 
 	-- Write new interface
-	local olsrbase = _strip_internals(uci:get_all("freifunk", "olsr_interface"))
+	local olsrbase = uci:get_all("freifunk", "olsr_interface")
+	util.update(olsrbase, uci:get_all(external, "olsr_interface") or {})
 	olsrbase.interface = device
 	olsrbase.ignore    = "0"
 	uci:section("olsrd", "Interface", nil, olsrbase)
@@ -214,13 +243,9 @@ end
 
 
 function share.write(self, section, value)
-	if value == "maybe" then
-		return
-	end
-
 	uci:delete_all("firewall", "forwarding", {src="freifunk", dest="wan"})
 
-	if value == "yes" then
+	if value == "1" then
 		uci:section("firewall", "forwarding", nil, {src="freifunk", dest="wan"})
 	end
 	uci:save("firewall")
@@ -242,8 +267,9 @@ function client.write(self, section, value)
 	if not inet or not isubnet or not inode then
 		return
 	end
-	
-	inet = uci:get("freifunk", inet, "prefix") or inet
+	local community = inet
+	local external  = community and uci:get("freifunk", community, "external") or ""
+	inet = uci:get("freifunk", community, "prefix") or inet
 
 	local dhcpbeg = 48 + tonumber(inode) * 4
 	local dclient = "%s.%s.%s" % {inet:gsub("^[0-9]+", "10"), isubnet, dhcpbeg}
@@ -253,7 +279,8 @@ function client.write(self, section, value)
 	uci:delete("network", device .. "dhcp")
 
 	-- Create alias
-	local aliasbase = _strip_internals(uci:get_all("freifunk", "alias"))
+	local aliasbase = uci:get_all("freifunk", "alias")
+	util.update(aliasbase, uci:get_all(external, "alias") or {})
 	aliasbase.interface = device
 	aliasbase.ipaddr = dclient
 	aliasbase.proto = "static"
@@ -262,7 +289,8 @@ function client.write(self, section, value)
 
 
 	-- Create dhcp
-	local dhcpbase = _strip_internals(uci:get_all("freifunk", "dhcp"))
+	local dhcpbase = uci:get_all("freifunk", "dhcp")
+	util.update(dhcpbase, uci:get_all(external, "dhcp") or {})
 	dhcpbase.interface = device .. "dhcp"
 	dhcpbase.start = dhcpbeg
 	dhcpbase.limit = limit