Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reorganised Freifunk pages

Browse source 
Unified Community configuration
This commit is contained in:
Steven Barth 2008-09-15 16:52:58 +00:00
parent dc33ed7b57
commit dbd1d3c273
24 changed files with 96 additions and 206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/community-augsburg/ipkg/postinst
View file

@ -1,4 +0,0 @@
#!/bin/sh
[ -n "${IPKG_INSTROOT}" ] || {
( . /etc/uci-defaults/luci-community-augsburg ) && rm -f /etc/uci-defaults/luci-community-augsburg
}

16
applications/community-augsburg/root/etc/uci-defaults/luci-community-augsburg
View file

@ -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

2
applications/community-berlin/Makefile
View file

@ -1,2 +0,0 @@
include ../../build/config.mk
include ../../build/module.mk

4
applications/community-berlin/ipkg/postinst
View file

@ -1,4 +0,0 @@
#!/bin/sh
[ -n "${IPKG_INSTROOT}" ] || {
( . /etc/uci-defaults/luci-community-berlin ) && rm -f /etc/uci-defaults/luci-community-berlin
}

16
applications/community-berlin/root/etc/uci-defaults/luci-community-berlin
View file

@ -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

2
applications/community-halle/Makefile
View file

@ -1,2 +0,0 @@
include ../../build/config.mk
include ../../build/module.mk

4
applications/community-halle/ipkg/postinst
View file

@ -1,4 +0,0 @@
#!/bin/sh
[ -n "${IPKG_INSTROOT}" ] || {
( . /etc/uci-defaults/luci-community-halle ) && rm -f /etc/uci-defaults/luci-community-halle
}

2
applications/community-hannover/Makefile
View file

@ -1,2 +0,0 @@
include ../../build/config.mk
include ../../build/module.mk

4
applications/community-hannover/ipkg/postinst
View file

@ -1,4 +0,0 @@
#!/bin/sh
[ -n "${IPKG_INSTROOT}" ] || {
( . /etc/uci-defaults/luci-community-hannover ) && rm -f /etc/uci-defaults/luci-community-hannover
}

16
applications/community-hannover/root/etc/uci-defaults/luci-community-hannover
View file

@ -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

2
applications/community-leipzig/Makefile
View file

@ -1,2 +0,0 @@
include ../../build/config.mk
include ../../build/module.mk

4
applications/community-leipzig/ipkg/postinst
View file

@ -1,4 +0,0 @@
#!/bin/sh
[ -n "${IPKG_INSTROOT}" ] || {
( . /etc/uci-defaults/luci-community-leipzig ) && rm -f /etc/uci-defaults/luci-community-leipzig
}

7
applications/community-leipzig/root/etc/uci-defaults/luci-community-leipzig
View file

@ -1,7 +0,0 @@
#!/bin/sh
uci batch <<-EOF
set luci.main.mediaurlbase=/luci-static/fledermaus
set luci.main.lang=de
commit luci
EOF

0
applications/community-augsburg/Makefile → applications/freifunk-community/Makefile
View file

4
applications/freifunk-community/ipkg/postinst Executable file
View file

@ -0,0 +1,4 @@
#!/bin/sh
[ -n "${IPKG_INSTROOT}" ] || {
( . /etc/uci-defaults/luci-freifunk-community ) && rm -f /etc/uci-defaults/luci-freifunk-community
}

0
applications/community-halle/root/etc/uci-defaults/luci-community-halle → applications/freifunk-community/root/etc/uci-defaults/luci-freifunk-community
View file

2
applications/luci-ffwizard-leipzig/luasrc/controller/ffwizard.lua
View file

@ -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

76
applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
View file

@ -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

101
contrib/package/luci/Makefile
View file

@ -61,7 +61,7 @@ endef
define Package/luci/fftemplate
$(call Package/luci/libtemplate)
SUBMENU:=LuCI Freifunk Support
SUBMENU:=LuCI Freifunk Support (GERMAN ONLY)
DEPENDS:=+luci-mod-freifunk
endef
@ -250,7 +250,7 @@ endef
### Community Packages ###
define Package/luci-ff-halle
define Package/luci-freifunk-community
$(call Package/luci/fftemplate)
DEPENDS+= \
+luci-sgi-cgi +luci-app-splash +luci-app-olsr \
@ -259,74 +259,11 @@ define Package/luci-ff-halle
+luci-i18n-german \
+olsrd-luci +olsrd-luci-mod-dyn-gw +olsrd-luci-mod-txtinfo +olsrd-luci-mod-nameservice \
+kmod-tun +ip
TITLE:=Freifunk Halle Community Meta-Package
TITLE:=Freifunk Community Meta-Package
endef
define Package/luci-ff-halle/install
$(call Package/luci/install/template,$(1),applications/community-halle)
endef
define Package/luci-ff-leipzig
$(call Package/luci/fftemplate)
DEPENDS+= \
+luci-sgi-cgi +luci-app-splash +luci-app-olsr \
+luci-app-ffwizard-leipzig \
+luci-theme-fledermaus \
+luci-i18n-german \
+olsrd-luci +olsrd-luci-mod-dyn-gw +olsrd-luci-mod-txtinfo +olsrd-luci-mod-nameservice \
+kmod-tun +ip
TITLE:=Freifunk Leipzig Community Meta-Package
endef
define Package/luci-ff-leipzig/install
$(call Package/luci/install/template,$(1),applications/community-leipzig)
endef
define Package/luci-ff-hannover
$(call Package/luci/fftemplate)
DEPENDS+= \
+luci-sgi-cgi +luci-app-splash +luci-app-olsr \
+luci-theme-fledermaus \
+luci-i18n-german \
+olsrd-luci +olsrd-luci-mod-dyn-gw +olsrd-luci-mod-txtinfo +olsrd-luci-mod-nameservice
TITLE:=Freifunk Hannover Community Meta-Package
URL:=http://www.freifunk-hannover.de/
MAINTAINER:=Mickey Knox <mickey-at-netfreaks-dot-org>
endef
define Package/luci-ff-hannover/install
$(call Package/luci/install/template,$(1),applications/community-hannover)
endef
define Package/luci-ff-berlin
$(call Package/luci/fftemplate)
DEPENDS+= \
+luci-sgi-cgi +luci-app-splash +luci-app-olsr \
+luci-theme-fledermaus \
+luci-i18n-german \
+olsrd-luci +olsrd-luci-mod-dyn-gw +olsrd-luci-mod-txtinfo +olsrd-luci-mod-nameservice
TITLE:=Freifunk Berlin Community Meta-Package
endef
define Package/luci-ff-berlin/install
$(call Package/luci/install/template,$(1),applications/community-berlin)
endef
define Package/luci-ff-augsburg
$(call Package/luci/fftemplate)
DEPENDS+= \
+luci-sgi-cgi +luci-app-splash +luci-app-olsr \
+luci-theme-fledermaus \
+luci-i18n-german \
+olsrd-luci +olsrd-luci-mod-dyn-gw +olsrd-luci-mod-txtinfo +olsrd-luci-mod-nameservice
TITLE:=Freifunk Augsburg Community Meta-Package
endef
define Package/luci-ff-augsburg/install
$(call Package/luci/install/template,$(1),applications/community-augsburg)
define Package/luci-freifunk-community/install
$(call Package/luci/install/template,$(1),applications/freifunk-community)
endef
### Modules ###
@ -660,22 +597,6 @@ ifneq ($(CONFIG_PACKAGE_luci-httpd),)
PKG_SELECTED_MODULES+=libs/httpd
endif
ifneq ($(CONFIG_PACKAGE_luci-ff-halle),)
PKG_SELECTED_MODULES+=applications/community-halle
endif
ifneq ($(CONFIG_PACKAGE_luci-ff-leipzig),)
PKG_SELECTED_MODULES+=applications/community-leipzig
endif
ifneq ($(CONFIG_PACKAGE_luci-ff-hannover),)
PKG_SELECTED_MODULES+=applications/community-hannover
endif
ifneq ($(CONFIG_PACKAGE_luci-ff-berlin),)
PKG_SELECTED_MODULES+=applications/community-berlin
endif
ifneq ($(CONFIG_PACKAGE_luci-ff-augsburg),)
PKG_SELECTED_MODULES+=applications/community-augsburg
endif
ifneq ($(CONFIG_PACKAGE_luci-admin-core),)
PKG_SELECTED_MODULES+=modules/admin-core
endif
@ -692,6 +613,10 @@ ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk),)
PKG_SELECTED_MODULES+=modules/freifunk
endif
ifneq ($(CONFIG_PACKAGE_luci-freifunk-community),)
PKG_SELECTED_MODULES+=applications/luci-freifunk-community
endif
ifneq ($(CONFIG_PACKAGE_luci-app-ffwizard-leipzig),)
PKG_SELECTED_MODULES+=applications/luci-ffwizard-leipzig
endif
@ -783,18 +708,14 @@ $(eval $(call BuildPackage,luci-uvl))
$(eval $(call BuildPackage,luci-httpd))
$(eval $(call BuildPackage,luci-ff-halle))
$(eval $(call BuildPackage,luci-ff-leipzig))
$(eval $(call BuildPackage,luci-ff-hannover))
$(eval $(call BuildPackage,luci-ff-berlin))
$(eval $(call BuildPackage,luci-ff-augsburg))
$(eval $(call BuildPackage,luci-admin-core))
$(eval $(call BuildPackage,luci-admin-mini))
$(eval $(call BuildPackage,luci-admin-full))
$(eval $(call BuildPackage,luci-admin-rpc))
$(eval $(call BuildPackage,luci-mod-freifunk))
$(eval $(call BuildPackage,luci-freifunk-community))
$(eval $(call BuildPackage,luci-app-ffwizard-leipzig))
$(eval $(call BuildPackage,luci-app-firewall))
$(eval $(call BuildPackage,luci-app-olsr))

6
modules/freifunk/luasrc/controller/freifunk/freifunk.lua
View file

@ -52,12 +52,14 @@ function index()
assign({"freifunk", "statistics"}, {"admin", "statistics", "graph"}, i18n("stat_statistics", "Statistiken"), 40)
end
local page = node("admin", "index", "freifunk")
assign({"mini", "freifunk"}, {"admin", "freifunk"}, "Freifunk", 15)
entry({"admin", "freifunk"}, alias("admin", "freifunk", "index"), "Freifunk", 15)
local page = node("admin", "freifunk", "index")
page.target = cbi("freifunk/freifunk")
page.title = "Freifunk"
page.order = 30
local page = node("admin", "index", "contact")
local page = node("admin", "freifunk", "contact")
page.target = cbi("freifunk/contact")
page.title = "Kontakt"
page.order = 40

21
modules/freifunk/root/etc/config/freifunk
View file

@ -83,31 +83,40 @@ config defaults olsr_interface
config community leipzig
option name "Freifunk Leipzig (104.61)"
option name "Freifunk Leipzig"
option homepage http://leipzig.freifunk.net
option ssid "leipzig.freifunk.net"
option prefix "104.61"
config community halle
option name "Freifunk Halle (104.62)"
option name "Freifunk Halle"
option homepage http://halle.freifunk.net
option ssid "halle.freifunk.net"
option prefix "104.62"
config community l59
option name "Leisnig, Gadow, ... (104.59)"
option name "Freifunk L59"
option homepage http://freifunk.net
option ssid "start.freifunk.net"
option prefix "104.59"
config community berlin
option name "Freifunk Berlin (104)"
option name "Freifunk Berlin"
option homepage http://berlin.freifunk.net
option ssid "olsr.freifunk.net"
option prefix "104"
option external freifunk_berlin
config community hannover
option name "Freifunk Hannover"
option homepage http://hannover.freifunk.net
option ssid "hannover.freifunk.net"
option prefix "10.2"
option external freifunk_hannover
config community augsburg
option name "Freifunk Augsburg (191.161)"
option name "Freifunk Augsburg"
option homepage http://augsburg.freifunk.net
option ssid "augsburg.freifunk.net"
option prefix "191.161"
option prefix "191.161"
option external freifunk_augsburg

2
modules/freifunk/root/etc/config/freifunk_augsburg Normal file
View file

@ -0,0 +1,2 @@
config defaults interface
option netmask 255.255.0.0

2
modules/freifunk/root/etc/config/freifunk_berlin Normal file
View file

@ -0,0 +1,2 @@
config defaults wifi_device
option channel 10

5
modules/freifunk/root/etc/config/freifunk_hannover Normal file
View file

@ -0,0 +1,5 @@
config defaults wifi_iface
option bssid CA:FF:EE:CA:FF:EE
config defaults interface
option netmask 255.255.0.0