From aa9ccf77c6648515ba58c37b9345cdbd561028db Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Thu, 8 May 2008 15:37:41 +0000 Subject: [PATCH 1/1] =?utf8?q?*=20M=C3=B6rdercommit=20;-)=20*=20Major=20Re?= =?utf8?q?pository=20Reorganisation=20*=20API=200.4=20Softfreeze=20to=20co?= =?utf8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- INSTALL | 2 +- Makefile | 22 ++ README | 50 ---- applications/community-leipzig/Makefile | 2 + .../etc/uci-defaults/ffluci-community-leipzig | 15 ++ applications/luci-fw/Makefile | 2 + .../luci-fw/root/etc/config}/luci_fw | 0 .../luci-fw/root/etc}/init.d/luci_fw | 0 .../src/model/cbi/admin_network/firewall.lua | 0 .../src/model/cbi/admin_network/portfw.lua | 0 .../luci-fw/src/model/menu/50luci-fw.lua | 3 + applications/luci-splash/Makefile | 2 + .../luci-splash/root/etc/config/luci_splash | 0 .../root/etc/cron.minutely/luci_splash | 0 .../luci-splash/root/etc/init.d/luci_splash | 0 .../root/etc}/luci_splash_httpd.conf | 0 .../lib}/luci-splash/htdocs/cgi-bin/index.cgi | 0 .../usr/lib}/luci-splash/htdocs/index.html | 0 .../root/www/cgi-bin/luci_splash.cgi | 0 .../luci-splash/src/controller/controller.lua | 0 .../src/model/cbi/admin_services/splash.lua | 0 .../src/model/menu/50luci-splash.lua | 2 + .../src/model}/view/splash/splash.htm | 0 .../src/model}/view/splash_splash/index.htm | 0 .../src/model}/view/splash_splash/splash.htm | 0 applications/sgi-haserl/Makefile | 2 + .../sgi-haserl/root/www/cgi-bin}/ffluci | 0 .../root/www/cgi-bin}/ffluci-upload | 0 .../sgi-haserl/root/www/cgi-bin}/index.cgi | 0 .../sgi-haserl/root/www}/index.html | 0 .../sgi-haserl/src}/sgi/haserl.lua | 2 +- applications/sgi-webuci/Makefile | 2 + .../sgi-webuci/root/lib/webuci/main.lua | 0 .../sgi-webuci/src}/sgi/webuci.lua | 2 +- build/config.mk | 3 + build/module.mk | 15 ++ contrib/package/ffluci-splash/Makefile | 43 ---- contrib/package/ffluci-splash/ipkg/conffiles | 1 - .../package/ffluci-splash/src/luci-splash.lua | 176 ------------- contrib/package/ffluci-system-addons/Makefile | 32 --- contrib/package/ffluci/Makefile | 232 ++++++++++++++---- contrib/package/ffluci/ipkg/conffiles | 2 - .../ipkg/ffluci-community-leipzig.postinst | 4 + ...ci.postinst => ffluci-sgi-haserl.postinst} | 0 contrib/package/luci-addons/Makefile | 37 +++ .../dist/etc/crontabs/root} | 0 .../dist/etc/hotplug.d/iface/20-aliases} | 0 .../luci-addons/dist/sbin}/ffluci-flash | 0 .../dist/usr/bin}/run-parts | 0 core/Makefile | 41 +--- core/contrib/uci/freifunk | 26 -- core/{contrib/uci => root/etc/config}/luci | 0 core/src/{ffluci => }/bits.lua | 0 core/src/{ffluci => }/cbi.lua | 0 core/src/{ffluci => }/config.lua | 0 core/src/{ffluci => }/debug.lua | 0 core/src/{ffluci => }/dispatcher.lua | 0 core/src/{ffluci => }/fs.lua | 0 core/src/{ffluci => }/http.lua | 0 core/src/{ffluci => }/i18n.lua | 0 core/src/{ffluci => }/i18n/cbi.en | 0 core/src/{ffluci => }/i18n/default.en | 0 core/src/{ffluci => }/init.lua | 0 core/src/{ffluci => }/menu.lua | 0 core/src/{ffluci => }/model/ipkg.lua | 0 core/src/{ffluci => }/model/uci.lua | 0 core/src/{ffluci => }/model/uci/libuci.lua | 0 core/src/{ffluci => }/model/uci/wrapper.lua | 0 core/src/{ffluci => }/sys.lua | 0 core/src/{ffluci => }/template.lua | 0 core/src/{ffluci => }/util.lua | 0 core/src/{ffluci => }/view/cbi/dvalue.htm | 0 core/src/{ffluci => }/view/cbi/footer.htm | 0 core/src/{ffluci => }/view/cbi/fvalue.htm | 0 core/src/{ffluci => }/view/cbi/header.htm | 0 core/src/{ffluci => }/view/cbi/lvalue.htm | 0 core/src/{ffluci => }/view/cbi/map.htm | 0 core/src/{ffluci => }/view/cbi/mvalue.htm | 0 core/src/{ffluci => }/view/cbi/nsection.htm | 0 core/src/{ffluci => }/view/cbi/tsection.htm | 0 core/src/{ffluci => }/view/cbi/ucisection.htm | 0 core/src/{ffluci => }/view/cbi/value.htm | 0 .../src/{ffluci => }/view/cbi/valuefooter.htm | 0 .../src/{ffluci => }/view/cbi/valueheader.htm | 0 core/src/{ffluci => }/view/error404.htm | 0 core/src/{ffluci => }/view/error500.htm | 0 core/src/{ffluci => }/view/footer.htm | 0 core/src/{ffluci => }/view/header.htm | 0 module/admin-core/Makefile | 34 --- .../admin-core/contrib/init.d/luci_freifunk | 91 ------- .../admin-core/src/controller/admin/index.lua | 171 ------------- .../src/model/cbi/admin_index/contact.lua | 18 -- .../src/model/cbi/admin_index/freifunk.lua | 23 -- module/public-core/Makefile | 35 --- .../src/controller/public/index.lua | 1 - .../src/controller/public/olsr.lua | 137 ----------- .../src/controller/public/status.lua | 21 -- .../src/controller/sudo/status.lua | 1 - .../public-core/src/model/menu/00public.lua | 12 - .../src/view/public_index/contact.htm | 13 - .../src/view/public_index/index.htm | 11 - .../src/view/public_olsr/error_olsr.htm | 6 - .../public-core/src/view/public_olsr/hna.htm | 17 -- .../src/view/public_olsr/index.htm | 43 ---- .../public-core/src/view/public_olsr/mid.htm | 17 -- .../src/view/public_olsr/routes.htm | 36 --- .../src/view/public_olsr/topology.htm | 23 -- .../src/view/public_status/index.htm | 59 ----- .../src/view/public_status/iwscan.htm | 21 -- .../src/view/public_status/routes.htm | 28 --- .../src/view/sudo_status/iwconfig.htm | 21 -- .../src/view/sudo_status/iwscan.htm | 22 -- module/rpc-core/Makefile | 35 --- .../rpc-core/src/controller/rpc/luciinfo.lua | 41 ---- modules/admin-core/Makefile | 2 + .../admin-core/src/controller/admin/index.lua | 1 + .../src/controller/admin/network.lua | 0 .../src/controller/admin/services.lua | 0 .../src/controller/admin/system.lua | 0 .../admin-core/src/controller/admin/uci.lua | 0 .../admin-core/src/controller/admin/wifi.lua | 0 .../admin-core/src/i18n/admin_index.en | 13 - .../admin-core/src/i18n/admin_uci.en | 0 .../src/model/cbi/admin_index/luci.lua | 0 .../src/model/cbi/admin_network/dhcp.lua | 0 .../src/model/cbi/admin_network/ifaces.lua | 0 .../src/model/cbi/admin_network/ptp.lua | 0 .../src/model/cbi/admin_network/qos.lua | 0 .../src/model/cbi/admin_network/routes.lua | 0 .../src/model/cbi/admin_network/vlan.lua | 0 .../src/model/cbi/admin_services/dnsmasq.lua | 0 .../src/model/cbi/admin_services/dropbear.lua | 0 .../src/model/cbi/admin_services/httpd.lua | 0 .../src/model/cbi/admin_services/olsrd.lua | 0 .../src/model/cbi/admin_system/fstab.lua | 0 .../src/model/cbi/admin_system/hostname.lua | 0 .../src/model/cbi/admin_wifi/devices.lua | 0 .../src/model/cbi/admin_wifi/networks.lua | 0 .../admin-core/src/model/menu/00admin.lua | 8 - .../admin-core/src/view/admin_index/index.htm | 0 .../src/view/admin_index/wizard.htm | 0 .../src/view/admin_network/index.htm | 0 .../src/view/admin_services/index.htm | 0 .../src/view/admin_system/editor.htm | 0 .../src/view/admin_system/index.htm | 0 .../admin-core/src/view/admin_system/ipkg.htm | 0 .../src/view/admin_system/packages.htm | 0 .../src/view/admin_system/passwd.htm | 0 .../src/view/admin_system/reboot.htm | 0 .../src/view/admin_system/sshkeys.htm | 0 .../src/view/admin_system/upgrade.htm | 0 .../admin-core/src/view/admin_uci/apply.htm | 0 .../admin-core/src/view/admin_uci/changes.htm | 0 .../admin-core/src/view/admin_uci/revert.htm | 0 .../admin-core/src/view/admin_wifi/index.htm | 0 themes/fledermaus/Makefile | 2 + .../www/ffluci}/media/cascade.css | 0 .../{contrib => root/www/ffluci}/media/cbi.js | 0 .../www/ffluci}/media/logo.png | Bin 159 files changed, 300 insertions(+), 1383 deletions(-) create mode 100644 Makefile delete mode 100644 README create mode 100644 applications/community-leipzig/Makefile create mode 100644 applications/community-leipzig/root/etc/uci-defaults/ffluci-community-leipzig create mode 100644 applications/luci-fw/Makefile rename {module/admin-core/contrib/uci => applications/luci-fw/root/etc/config}/luci_fw (100%) rename {module/admin-core/contrib => applications/luci-fw/root/etc}/init.d/luci_fw (100%) rename {module/admin-core => applications/luci-fw}/src/model/cbi/admin_network/firewall.lua (100%) rename {module/admin-core => applications/luci-fw}/src/model/cbi/admin_network/portfw.lua (100%) create mode 100644 applications/luci-fw/src/model/menu/50luci-fw.lua create mode 100644 applications/luci-splash/Makefile rename contrib/package/ffluci-splash/src/luci_splash.uci => applications/luci-splash/root/etc/config/luci_splash (100%) rename contrib/package/ffluci-splash/src/luci_splash.cron => applications/luci-splash/root/etc/cron.minutely/luci_splash (100%) rename contrib/package/ffluci-splash/src/luci_splash.init => applications/luci-splash/root/etc/init.d/luci_splash (100%) rename {contrib/package/ffluci-splash/src => applications/luci-splash/root/etc}/luci_splash_httpd.conf (100%) rename {contrib/package/ffluci-splash/src => applications/luci-splash/root/usr/lib}/luci-splash/htdocs/cgi-bin/index.cgi (100%) rename {contrib/package/ffluci-splash/src => applications/luci-splash/root/usr/lib}/luci-splash/htdocs/index.html (100%) rename module/admin-core/contrib/luci-splash => applications/luci-splash/root/www/cgi-bin/luci_splash.cgi (100%) rename module/admin-core/src/controller/splash/splash.lua => applications/luci-splash/src/controller/controller.lua (100%) rename {module/admin-core => applications/luci-splash}/src/model/cbi/admin_services/splash.lua (100%) create mode 100644 applications/luci-splash/src/model/menu/50luci-splash.lua rename {module/admin-core/src => applications/luci-splash/src/model}/view/splash/splash.htm (100%) rename {module/admin-core/src => applications/luci-splash/src/model}/view/splash_splash/index.htm (100%) rename {module/admin-core/src => applications/luci-splash/src/model}/view/splash_splash/splash.htm (100%) create mode 100644 applications/sgi-haserl/Makefile rename {core/contrib => applications/sgi-haserl/root/www/cgi-bin}/ffluci (100%) rename {core/contrib => applications/sgi-haserl/root/www/cgi-bin}/ffluci-upload (100%) rename {core/contrib => applications/sgi-haserl/root/www/cgi-bin}/index.cgi (100%) rename {core/contrib => applications/sgi-haserl/root/www}/index.html (100%) rename {core/src/ffluci => applications/sgi-haserl/src}/sgi/haserl.lua (97%) create mode 100644 applications/sgi-webuci/Makefile rename core/contrib/webuci_bootstrap.lua => applications/sgi-webuci/root/lib/webuci/main.lua (100%) rename {core/src/ffluci => applications/sgi-webuci/src}/sgi/webuci.lua (97%) create mode 100644 build/config.mk create mode 100644 build/module.mk delete mode 100644 contrib/package/ffluci-splash/Makefile delete mode 100644 contrib/package/ffluci-splash/ipkg/conffiles delete mode 100644 contrib/package/ffluci-splash/src/luci-splash.lua delete mode 100644 contrib/package/ffluci-system-addons/Makefile delete mode 100644 contrib/package/ffluci/ipkg/conffiles create mode 100755 contrib/package/ffluci/ipkg/ffluci-community-leipzig.postinst rename contrib/package/ffluci/ipkg/{ffluci.postinst => ffluci-sgi-haserl.postinst} (100%) create mode 100644 contrib/package/luci-addons/Makefile rename contrib/package/{ffluci-system-addons/src/root.crontab => luci-addons/dist/etc/crontabs/root} (100%) rename contrib/package/{ffluci-system-addons/src/hotplug.d-20-aliases => luci-addons/dist/etc/hotplug.d/iface/20-aliases} (100%) rename {module/admin-core/contrib => contrib/package/luci-addons/dist/sbin}/ffluci-flash (100%) rename contrib/package/{ffluci-system-addons/src => luci-addons/dist/usr/bin}/run-parts (100%) delete mode 100644 core/contrib/uci/freifunk rename core/{contrib/uci => root/etc/config}/luci (100%) rename core/src/{ffluci => }/bits.lua (100%) rename core/src/{ffluci => }/cbi.lua (100%) rename core/src/{ffluci => }/config.lua (100%) rename core/src/{ffluci => }/debug.lua (100%) rename core/src/{ffluci => }/dispatcher.lua (100%) rename core/src/{ffluci => }/fs.lua (100%) rename core/src/{ffluci => }/http.lua (100%) rename core/src/{ffluci => }/i18n.lua (100%) rename core/src/{ffluci => }/i18n/cbi.en (100%) rename core/src/{ffluci => }/i18n/default.en (100%) rename core/src/{ffluci => }/init.lua (100%) rename core/src/{ffluci => }/menu.lua (100%) rename core/src/{ffluci => }/model/ipkg.lua (100%) rename core/src/{ffluci => }/model/uci.lua (100%) rename core/src/{ffluci => }/model/uci/libuci.lua (100%) rename core/src/{ffluci => }/model/uci/wrapper.lua (100%) rename core/src/{ffluci => }/sys.lua (100%) rename core/src/{ffluci => }/template.lua (100%) rename core/src/{ffluci => }/util.lua (100%) rename core/src/{ffluci => }/view/cbi/dvalue.htm (100%) rename core/src/{ffluci => }/view/cbi/footer.htm (100%) rename core/src/{ffluci => }/view/cbi/fvalue.htm (100%) rename core/src/{ffluci => }/view/cbi/header.htm (100%) rename core/src/{ffluci => }/view/cbi/lvalue.htm (100%) rename core/src/{ffluci => }/view/cbi/map.htm (100%) rename core/src/{ffluci => }/view/cbi/mvalue.htm (100%) rename core/src/{ffluci => }/view/cbi/nsection.htm (100%) rename core/src/{ffluci => }/view/cbi/tsection.htm (100%) rename core/src/{ffluci => }/view/cbi/ucisection.htm (100%) rename core/src/{ffluci => }/view/cbi/value.htm (100%) rename core/src/{ffluci => }/view/cbi/valuefooter.htm (100%) rename core/src/{ffluci => }/view/cbi/valueheader.htm (100%) rename core/src/{ffluci => }/view/error404.htm (100%) rename core/src/{ffluci => }/view/error500.htm (100%) rename core/src/{ffluci => }/view/footer.htm (100%) rename core/src/{ffluci => }/view/header.htm (100%) delete mode 100644 module/admin-core/Makefile delete mode 100644 module/admin-core/contrib/init.d/luci_freifunk delete mode 100644 module/admin-core/src/controller/admin/index.lua delete mode 100644 module/admin-core/src/model/cbi/admin_index/contact.lua delete mode 100644 module/admin-core/src/model/cbi/admin_index/freifunk.lua delete mode 100644 module/public-core/Makefile delete mode 100644 module/public-core/src/controller/public/index.lua delete mode 100644 module/public-core/src/controller/public/olsr.lua delete mode 100644 module/public-core/src/controller/public/status.lua delete mode 100644 module/public-core/src/controller/sudo/status.lua delete mode 100644 module/public-core/src/model/menu/00public.lua delete mode 100644 module/public-core/src/view/public_index/contact.htm delete mode 100644 module/public-core/src/view/public_index/index.htm delete mode 100644 module/public-core/src/view/public_olsr/error_olsr.htm delete mode 100644 module/public-core/src/view/public_olsr/hna.htm delete mode 100644 module/public-core/src/view/public_olsr/index.htm delete mode 100644 module/public-core/src/view/public_olsr/mid.htm delete mode 100644 module/public-core/src/view/public_olsr/routes.htm delete mode 100644 module/public-core/src/view/public_olsr/topology.htm delete mode 100644 module/public-core/src/view/public_status/index.htm delete mode 100644 module/public-core/src/view/public_status/iwscan.htm delete mode 100644 module/public-core/src/view/public_status/routes.htm delete mode 100644 module/public-core/src/view/sudo_status/iwconfig.htm delete mode 100644 module/public-core/src/view/sudo_status/iwscan.htm delete mode 100644 module/rpc-core/Makefile delete mode 100644 module/rpc-core/src/controller/rpc/luciinfo.lua create mode 100644 modules/admin-core/Makefile create mode 100644 modules/admin-core/src/controller/admin/index.lua rename {module => modules}/admin-core/src/controller/admin/network.lua (100%) rename {module => modules}/admin-core/src/controller/admin/services.lua (100%) rename {module => modules}/admin-core/src/controller/admin/system.lua (100%) rename {module => modules}/admin-core/src/controller/admin/uci.lua (100%) rename {module => modules}/admin-core/src/controller/admin/wifi.lua (100%) rename {module => modules}/admin-core/src/i18n/admin_index.en (69%) rename {module => modules}/admin-core/src/i18n/admin_uci.en (100%) rename {module => modules}/admin-core/src/model/cbi/admin_index/luci.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_network/dhcp.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_network/ifaces.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_network/ptp.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_network/qos.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_network/routes.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_network/vlan.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_services/dnsmasq.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_services/dropbear.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_services/httpd.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_services/olsrd.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_system/fstab.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_system/hostname.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_wifi/devices.lua (100%) rename {module => modules}/admin-core/src/model/cbi/admin_wifi/networks.lua (100%) rename {module => modules}/admin-core/src/model/menu/00admin.lua (76%) rename {module => modules}/admin-core/src/view/admin_index/index.htm (100%) rename {module => modules}/admin-core/src/view/admin_index/wizard.htm (100%) rename {module => modules}/admin-core/src/view/admin_network/index.htm (100%) rename {module => modules}/admin-core/src/view/admin_services/index.htm (100%) rename {module => modules}/admin-core/src/view/admin_system/editor.htm (100%) rename {module => modules}/admin-core/src/view/admin_system/index.htm (100%) rename {module => modules}/admin-core/src/view/admin_system/ipkg.htm (100%) rename {module => modules}/admin-core/src/view/admin_system/packages.htm (100%) rename {module => modules}/admin-core/src/view/admin_system/passwd.htm (100%) rename {module => modules}/admin-core/src/view/admin_system/reboot.htm (100%) rename {module => modules}/admin-core/src/view/admin_system/sshkeys.htm (100%) rename {module => modules}/admin-core/src/view/admin_system/upgrade.htm (100%) rename {module => modules}/admin-core/src/view/admin_uci/apply.htm (100%) rename {module => modules}/admin-core/src/view/admin_uci/changes.htm (100%) rename {module => modules}/admin-core/src/view/admin_uci/revert.htm (100%) rename {module => modules}/admin-core/src/view/admin_wifi/index.htm (100%) create mode 100644 themes/fledermaus/Makefile rename themes/fledermaus/{contrib => root/www/ffluci}/media/cascade.css (100%) rename themes/fledermaus/{contrib => root/www/ffluci}/media/cbi.js (100%) rename themes/fledermaus/{contrib => root/www/ffluci}/media/logo.png (100%) diff --git a/INSTALL b/INSTALL index 8c3bbe8d7a..0620544116 100644 --- a/INSTALL +++ b/INSTALL @@ -13,7 +13,7 @@ TOC: 3. Run ./scripts/feeds update - 4. Run ./scripts/feeds install ffluci + 4. Run ./scripts/feeds install ffluci-meta 5. Type make menuconfig and you will find ffluci in the menu "Administration" diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000..a57acf4971 --- /dev/null +++ b/Makefile @@ -0,0 +1,22 @@ +include build/config.mk + +MODULES = applications/* core modules/* themes/* +LUA_TARGET = source + + +.PHONY: all build clean host hostclean + +all: build + +build: + for i in $(MODULES); do make -C$$i $(LUA_TARGET); done + +clean: + for i in $(MODULES); do make -C$$i clean; done + +host: build + mkdir -p host/ffluci + for i in $(MODULES); do cp $$i/dist$(LUCI_INSTALLDIR) host/ffluci -R; done + +hostclean: + rm host -rf \ No newline at end of file diff --git a/README b/README deleted file mode 100644 index 422eddf2ff..0000000000 --- a/README +++ /dev/null @@ -1,50 +0,0 @@ -FFLuCI - Freifunk Lua Configuration Interface - -This is a leightweight MVC-Webframework for small embedded devices. -It uses the the Lua programming language and relies on Haserl. - -It consists of several parts: - -MVC Dispatcher - Simple PATH_INFO based dispatching mechanism using Lua modules - - -Template engine - Support for plain and compiled templates, on-demand compiling support - Short markups: - <% Lua-Code %> - <%= Lua-Code with return value %> - <%:i18nkey default translation%> - <%+template-to-be-included%> - <%~uci.short.cut%> - - Predefined variables for controller dir and media dir - - -Configuration Bind Interface (CBI) - Generates and validates XHTML-Forms out of an UCI model description - Makes it very easy to create webinterface pages that manipulate UCI files - - -i18n Translation support - Simple multi-language per-module internationalization support - - -UCI wrapper support - Lua UCI-Wrapper adapting the CLI of the uci binary - - -Menu Building support - Supports menu building for modules and exported actions - - -HTTP-Abstraction and Formvalue validation support - HTTP-Redirect, Statuscode, Content-Type abstraction - Dynamic formvalue validation support including varaible type and - value range validation - - -Known issues: - There is a bug in older versions of busybox-httpd (as those in Kamikaze 7.09) - that do not handle Status-headers correctly making valid HTTP-Redirects impossible. - Using a newer version of Kamikaze should fix this. \ No newline at end of file diff --git a/applications/community-leipzig/Makefile b/applications/community-leipzig/Makefile new file mode 100644 index 0000000000..81a96f6a83 --- /dev/null +++ b/applications/community-leipzig/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk \ No newline at end of file diff --git a/applications/community-leipzig/root/etc/uci-defaults/ffluci-community-leipzig b/applications/community-leipzig/root/etc/uci-defaults/ffluci-community-leipzig new file mode 100644 index 0000000000..e73ff913c9 --- /dev/null +++ b/applications/community-leipzig/root/etc/uci-defaults/ffluci-community-leipzig @@ -0,0 +1,15 @@ +#!/bin/sh +uci batch <<-EOF + set freifunk.community.name='Freifunk Leipzig' + set freifunk.community.homepage=http://leipzig.freifunk.net + set freifunk.community.essid=leipzig.freifunk.net + set freifunk.community.bssid=02:CA:FF:EE:BA:BE + set freifunk.community.realm=db.leipzig.freifunk.net + set freifunk.community.channel=1 + set freifunk.community.net=104.0.0.0 + set freifunk.community.mask=255.0.0.0 + set freifunk.community.dhcp=10.0.0.0 + set freifunk.community.dhcpmask=255.255.255.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' +EOF + \ No newline at end of file diff --git a/applications/luci-fw/Makefile b/applications/luci-fw/Makefile new file mode 100644 index 0000000000..81a96f6a83 --- /dev/null +++ b/applications/luci-fw/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk \ No newline at end of file diff --git a/module/admin-core/contrib/uci/luci_fw b/applications/luci-fw/root/etc/config/luci_fw similarity index 100% rename from module/admin-core/contrib/uci/luci_fw rename to applications/luci-fw/root/etc/config/luci_fw diff --git a/module/admin-core/contrib/init.d/luci_fw b/applications/luci-fw/root/etc/init.d/luci_fw similarity index 100% rename from module/admin-core/contrib/init.d/luci_fw rename to applications/luci-fw/root/etc/init.d/luci_fw diff --git a/module/admin-core/src/model/cbi/admin_network/firewall.lua b/applications/luci-fw/src/model/cbi/admin_network/firewall.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_network/firewall.lua rename to applications/luci-fw/src/model/cbi/admin_network/firewall.lua diff --git a/module/admin-core/src/model/cbi/admin_network/portfw.lua b/applications/luci-fw/src/model/cbi/admin_network/portfw.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_network/portfw.lua rename to applications/luci-fw/src/model/cbi/admin_network/portfw.lua diff --git a/applications/luci-fw/src/model/menu/50luci-fw.lua b/applications/luci-fw/src/model/menu/50luci-fw.lua new file mode 100644 index 0000000000..93aba2fabe --- /dev/null +++ b/applications/luci-fw/src/model/menu/50luci-fw.lua @@ -0,0 +1,3 @@ +sel("admin", "network") +act("portfw", "Portweiterleitung") +act("firewall", "Firewall") \ No newline at end of file diff --git a/applications/luci-splash/Makefile b/applications/luci-splash/Makefile new file mode 100644 index 0000000000..81a96f6a83 --- /dev/null +++ b/applications/luci-splash/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk \ No newline at end of file diff --git a/contrib/package/ffluci-splash/src/luci_splash.uci b/applications/luci-splash/root/etc/config/luci_splash similarity index 100% rename from contrib/package/ffluci-splash/src/luci_splash.uci rename to applications/luci-splash/root/etc/config/luci_splash diff --git a/contrib/package/ffluci-splash/src/luci_splash.cron b/applications/luci-splash/root/etc/cron.minutely/luci_splash similarity index 100% rename from contrib/package/ffluci-splash/src/luci_splash.cron rename to applications/luci-splash/root/etc/cron.minutely/luci_splash diff --git a/contrib/package/ffluci-splash/src/luci_splash.init b/applications/luci-splash/root/etc/init.d/luci_splash similarity index 100% rename from contrib/package/ffluci-splash/src/luci_splash.init rename to applications/luci-splash/root/etc/init.d/luci_splash diff --git a/contrib/package/ffluci-splash/src/luci_splash_httpd.conf b/applications/luci-splash/root/etc/luci_splash_httpd.conf similarity index 100% rename from contrib/package/ffluci-splash/src/luci_splash_httpd.conf rename to applications/luci-splash/root/etc/luci_splash_httpd.conf diff --git a/contrib/package/ffluci-splash/src/luci-splash/htdocs/cgi-bin/index.cgi b/applications/luci-splash/root/usr/lib/luci-splash/htdocs/cgi-bin/index.cgi similarity index 100% rename from contrib/package/ffluci-splash/src/luci-splash/htdocs/cgi-bin/index.cgi rename to applications/luci-splash/root/usr/lib/luci-splash/htdocs/cgi-bin/index.cgi diff --git a/contrib/package/ffluci-splash/src/luci-splash/htdocs/index.html b/applications/luci-splash/root/usr/lib/luci-splash/htdocs/index.html similarity index 100% rename from contrib/package/ffluci-splash/src/luci-splash/htdocs/index.html rename to applications/luci-splash/root/usr/lib/luci-splash/htdocs/index.html diff --git a/module/admin-core/contrib/luci-splash b/applications/luci-splash/root/www/cgi-bin/luci_splash.cgi similarity index 100% rename from module/admin-core/contrib/luci-splash rename to applications/luci-splash/root/www/cgi-bin/luci_splash.cgi diff --git a/module/admin-core/src/controller/splash/splash.lua b/applications/luci-splash/src/controller/controller.lua similarity index 100% rename from module/admin-core/src/controller/splash/splash.lua rename to applications/luci-splash/src/controller/controller.lua diff --git a/module/admin-core/src/model/cbi/admin_services/splash.lua b/applications/luci-splash/src/model/cbi/admin_services/splash.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_services/splash.lua rename to applications/luci-splash/src/model/cbi/admin_services/splash.lua diff --git a/applications/luci-splash/src/model/menu/50luci-splash.lua b/applications/luci-splash/src/model/menu/50luci-splash.lua new file mode 100644 index 0000000000..99f7caa52b --- /dev/null +++ b/applications/luci-splash/src/model/menu/50luci-splash.lua @@ -0,0 +1,2 @@ +sel("admin", "services") +act("splash", "Client-Splash") \ No newline at end of file diff --git a/module/admin-core/src/view/splash/splash.htm b/applications/luci-splash/src/model/view/splash/splash.htm similarity index 100% rename from module/admin-core/src/view/splash/splash.htm rename to applications/luci-splash/src/model/view/splash/splash.htm diff --git a/module/admin-core/src/view/splash_splash/index.htm b/applications/luci-splash/src/model/view/splash_splash/index.htm similarity index 100% rename from module/admin-core/src/view/splash_splash/index.htm rename to applications/luci-splash/src/model/view/splash_splash/index.htm diff --git a/module/admin-core/src/view/splash_splash/splash.htm b/applications/luci-splash/src/model/view/splash_splash/splash.htm similarity index 100% rename from module/admin-core/src/view/splash_splash/splash.htm rename to applications/luci-splash/src/model/view/splash_splash/splash.htm diff --git a/applications/sgi-haserl/Makefile b/applications/sgi-haserl/Makefile new file mode 100644 index 0000000000..81a96f6a83 --- /dev/null +++ b/applications/sgi-haserl/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk \ No newline at end of file diff --git a/core/contrib/ffluci b/applications/sgi-haserl/root/www/cgi-bin/ffluci similarity index 100% rename from core/contrib/ffluci rename to applications/sgi-haserl/root/www/cgi-bin/ffluci diff --git a/core/contrib/ffluci-upload b/applications/sgi-haserl/root/www/cgi-bin/ffluci-upload similarity index 100% rename from core/contrib/ffluci-upload rename to applications/sgi-haserl/root/www/cgi-bin/ffluci-upload diff --git a/core/contrib/index.cgi b/applications/sgi-haserl/root/www/cgi-bin/index.cgi similarity index 100% rename from core/contrib/index.cgi rename to applications/sgi-haserl/root/www/cgi-bin/index.cgi diff --git a/core/contrib/index.html b/applications/sgi-haserl/root/www/index.html similarity index 100% rename from core/contrib/index.html rename to applications/sgi-haserl/root/www/index.html diff --git a/core/src/ffluci/sgi/haserl.lua b/applications/sgi-haserl/src/sgi/haserl.lua similarity index 97% rename from core/src/ffluci/sgi/haserl.lua rename to applications/sgi-haserl/src/sgi/haserl.lua index 7e9854d7d3..027697e2e4 100644 --- a/core/src/ffluci/sgi/haserl.lua +++ b/applications/sgi-haserl/src/sgi/haserl.lua @@ -5,7 +5,7 @@ Description: Server Gateway Interface for Haserl FileId: -$Id$ +$Id: haserl.lua 2027 2008-05-07 21:16:35Z Cyrus $ License: Copyright 2008 Steven Barth diff --git a/applications/sgi-webuci/Makefile b/applications/sgi-webuci/Makefile new file mode 100644 index 0000000000..81a96f6a83 --- /dev/null +++ b/applications/sgi-webuci/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk \ No newline at end of file diff --git a/core/contrib/webuci_bootstrap.lua b/applications/sgi-webuci/root/lib/webuci/main.lua similarity index 100% rename from core/contrib/webuci_bootstrap.lua rename to applications/sgi-webuci/root/lib/webuci/main.lua diff --git a/core/src/ffluci/sgi/webuci.lua b/applications/sgi-webuci/src/sgi/webuci.lua similarity index 97% rename from core/src/ffluci/sgi/webuci.lua rename to applications/sgi-webuci/src/sgi/webuci.lua index 5e17ab7935..bc1c7be7a2 100644 --- a/core/src/ffluci/sgi/webuci.lua +++ b/applications/sgi-webuci/src/sgi/webuci.lua @@ -5,7 +5,7 @@ Description: Server Gateway Interface for Haserl FileId: -$Id$ +$Id: webuci.lua 2027 2008-05-07 21:16:35Z Cyrus $ License: Copyright 2008 Steven Barth diff --git a/build/config.mk b/build/config.mk new file mode 100644 index 0000000000..af0b443d53 --- /dev/null +++ b/build/config.mk @@ -0,0 +1,3 @@ +LUAC = luac +LUAC_OPTIONS = -s +LUCI_INSTALLDIR = /usr/lib/lua/ffluci \ No newline at end of file diff --git a/build/module.mk b/build/module.mk new file mode 100644 index 0000000000..286927436c --- /dev/null +++ b/build/module.mk @@ -0,0 +1,15 @@ +.PHONY: all compile source clean + +all: compile + +source: + mkdir -p dist$(LUCI_INSTALLDIR) + cp root dist -R + cp src dist$(LUCI_INSTALLDIR) -R + for i in $$(find dist -name .svn); do rm $$i -rf; done + +compile: source + for i in $$(find dist -name *.lua); do $(LUAC) $(LUAC_OPTIONS) -o $$i $$i; done + +clean: + rm dist -rf \ No newline at end of file diff --git a/contrib/package/ffluci-splash/Makefile b/contrib/package/ffluci-splash/Makefile deleted file mode 100644 index 3ea123ffd6..0000000000 --- a/contrib/package/ffluci-splash/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=ffluci-splash -PKG_VERSION:=0.1 -PKG_RELEASE:=1 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -PKG_BUILD_DEPENDS:=lua-luci - -include $(INCLUDE_DIR)/package.mk - -define Package/ffluci-splash - SECTION:=admin - CATEGORY:=Administration - SUBMENU:=FFLuCI - DEPENDS:=+ffluci +iptables-mod-nat +lua-luci - TITLE:=FFLuCI DHCP-Splash -endef - -define Build/Compile -endef - -define Package/ffluci-splash/install - $(INSTALL_DIR) $(1)/usr/lib/luci-splash/htdocs/cgi-bin - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DIR) $(1)/etc/cron.minutely - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_DIR) $(1)/usr/sbin - - $(CP) -a ./src/luci-splash/* $(1)/usr/lib/luci-splash/ -R - $(INSTALL_BIN) ./src/luci-splash/htdocs/cgi-bin/index.cgi $(1)/usr/lib/luci-splash/htdocs/cgi-bin - $(INSTALL_BIN) ./src/luci_splash.init $(1)/etc/init.d/luci_splash - $(INSTALL_BIN) ./src/luci-splash.lua $(1)/usr/sbin/luci-splash - - $(INSTALL_BIN) ./src/luci_splash.cron $(1)/etc/cron.minutely/luci-splash - $(CP) -a ./src/luci_splash.uci $(1)/etc/config/luci_splash - $(CP) -a ./src/luci_splash_httpd.conf $(1)/etc/ - - $(CP) -a ./ipkg/conffiles $(1)/CONTROL/conffiles -endef - -$(eval $(call BuildPackage,ffluci-splash)) diff --git a/contrib/package/ffluci-splash/ipkg/conffiles b/contrib/package/ffluci-splash/ipkg/conffiles deleted file mode 100644 index dcbe1ad373..0000000000 --- a/contrib/package/ffluci-splash/ipkg/conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/config/luci_splash \ No newline at end of file diff --git a/contrib/package/ffluci-splash/src/luci-splash.lua b/contrib/package/ffluci-splash/src/luci-splash.lua deleted file mode 100644 index 2fa6bdd4a9..0000000000 --- a/contrib/package/ffluci-splash/src/luci-splash.lua +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/lua -package.path = "/usr/lib/lua/?.lua;/usr/lib/lua/?/init.lua;" .. package.path -package.cpath = "/usr/lib/lua/?.so;" .. package.cpath - -require("ffluci.http") -require("ffluci.sys") -require("ffluci.model.uci") - --- Init state session -uci = ffluci.model.uci.StateSession() - - -function main(argv) - local cmd = argv[1] - local arg = argv[2] - - if cmd == "status" then - if not arg then - os.exit(1) - end - - if iswhitelisted(arg) then - print("whitelisted") - os.exit(0) - end - - if haslease(arg) then - print("lease") - os.exit(0) - end - - print("unknown") - os.exit(0) - elseif cmd == "add" then - if not arg then - os.exit(1) - end - - if not haslease(arg) then - add_lease(arg) - else - print("already leased!") - os.exit(2) - end - os.exit(0) - elseif cmd == "remove" then - if not arg then - os.exit(1) - end - - remove_lease(arg) - os.exit(0) - elseif cmd == "sync" then - sync() - os.exit(0) - else - print("Usage: " .. argv[0] .. " [MAC]") - os.exit(1) - end -end - --- Add a lease to state and invoke add_rule -function add_lease(mac) - local key = uci:add("luci_splash", "lease") - uci:set("luci_splash", key, "mac", mac) - uci:set("luci_splash", key, "start", os.time()) - add_rule(mac) -end - - --- Remove a lease from state and invoke remove_rule -function remove_lease(mac) - mac = mac:lower() - - for k, v in pairs(uci:sections("luci_splash")) do - if v[".type"] == "lease" and v.mac:lower() == mac then - remove_rule(mac) - uci:del("luci_splash", k) - end - end -end - - --- Add an iptables rule -function add_rule(mac) - return os.execute("iptables -t nat -I luci_splash_leases -m mac --mac-source '"..mac.."' -j RETURN") -end - - --- Remove an iptables rule -function remove_rule(mac) - return os.execute("iptables -t nat -D luci_splash_leases -m mac --mac-source '"..mac.."' -j RETURN") -end - - --- Check whether a MAC-Address is listed in the lease state list -function haslease(mac) - mac = mac:lower() - - for k, v in pairs(uci:sections("luci_splash")) do - if v[".type"] == "lease" and v.mac and v.mac:lower() == mac then - return true - end - end - - return false -end - - --- Check whether a MAC-Address is whitelisted -function iswhitelisted(mac) - mac = mac:lower() - - for k, v in pairs(uci:sections("luci_splash")) do - if v[".type"] == "whitelist" and v.mac and v.mac:lower() == mac then - return true - end - end - - return false -end - - --- Returns a list of MAC-Addresses for which a rule is existing -function listrules() - local cmd = "iptables -t nat -L luci_splash_leases | grep RETURN |" - cmd = cmd .. "egrep -io [0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+" - return ffluci.util.split(ffluci.sys.exec(cmd)) -end - - --- Synchronise leases, remove abandoned rules -function sync() - local written = {} - local time = os.time() - - uci:t_load("luci_splash") - - -- Current leases in state files - local leases = uci:t_sections("luci_splash") - - -- Convert leasetime to seconds - local leasetime = tonumber(uci:t_get("luci_splash", "general", "leasetime")) * 3600 - - -- Clean state file - uci:t_revert("luci_splash") - - - -- For all leases - for k, v in pairs(leases) do - if v[".type"] == "lease" then - if os.difftime(time, tonumber(v.start)) > leasetime then - -- Remove expired - remove_rule(v.mac) - else - -- Rewrite state - local n = uci:t_add("luci_splash", "lease") - uci:t_set("luci_splash", n, "mac", v.mac) - uci:t_set("luci_splash", n, "start", v.start) - written[v.mac:lower()] = 1 - end - end - end - - - -- Delete rules without state - for i, r in ipairs(listrules()) do - if #r > 0 and not written[r:lower()] then - remove_rule(r) - end - end - - uci:t_save("luci_splash") -end - -main(arg) \ No newline at end of file diff --git a/contrib/package/ffluci-system-addons/Makefile b/contrib/package/ffluci-system-addons/Makefile deleted file mode 100644 index 622871fca9..0000000000 --- a/contrib/package/ffluci-system-addons/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=ffluci-system-addons -PKG_VERSION:=0.1 -PKG_RELEASE:=1 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -include $(INCLUDE_DIR)/package.mk - -define Package/ffluci-system-addons - SECTION:=admin - CATEGORY:=Administration - SUBMENU:=FFLuCI - TITLE:=FFLuCI System Addons for Kamikaze -endef - -define Build/Compile -endef - -define Package/ffluci-system-addons/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_DIR) $(1)/etc/crontabs - $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - - $(INSTALL_BIN) ./src/run-parts $(1)/usr/bin - $(CP) ./src/root.crontab $(1)/etc/crontabs/root - $(CP) ./src/hotplug.d-20-aliases $(1)/etc/hotplug.d/iface/20-aliases -endef - -$(eval $(call BuildPackage,ffluci-system-addons)) diff --git a/contrib/package/ffluci/Makefile b/contrib/package/ffluci/Makefile index 1b0f80e6b6..32d82b500b 100644 --- a/contrib/package/ffluci/Makefile +++ b/contrib/package/ffluci/Makefile @@ -1,79 +1,205 @@ include $(TOPDIR)/rules.mk +PKG_BRANCH:=trunk +PKG_SOURCE_URL:=https://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH) +PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p') + PKG_NAME:=ffluci -PKG_REV:=HEAD -PKG_VERSION:=0.3+svn$(PKG_REV) +PKG_VERSION:=0.4+svn$(PKG_REV) PKG_RELEASE:=1 -PKG_BRANCH:=trunk +PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz PKG_SOURCE_PROTO:=svn PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_URL:=https://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz + +PKG_BUILD_DEPENDS:=lua-luci PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -PKG_BUILD_DEPENDS:=lua-luci +# LUA_TARGET:=compile LUAC=$(BUILD_DIR_HOST)/lua-luci/luac +LUA_TARGET:=source -# MAKE_ACTION:=compile LUAC=$(BUILD_DIR_HOST)/lua-luci/luac -MAKE_ACTION:=source include $(INCLUDE_DIR)/package.mk -define Package/ffluci +define Build/Configure +endef + +define Build/Compile + $(MAKE) -C$(PKG_BUILD_DIR) build LUA_TARGET=$(LUA_TARGET) +endef + + +define Package/ffluci/template SECTION:=admin CATEGORY:=Administration - TITLE:=FFLuCI - SUBMENU:=FFLuCI - DEPENDS:=+luaposix +haserl-lua +ffluci-system-addons + TITLE:=FFLuCI - Freifunk Lua Configuration Interface + URL:=http://luci.freifunk-halle.net/ MAINTAINER:=Steven Barth endef -define Build/Configure +define Package/ffluci/install/template + $(CP) $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R + + for i in $(PKG_BUILD_DIR)/$(2)/dist/usr/bin/*; do $(INSTALL_BIN) $$i $(1)/usr/bin/; done + for i in $(PKG_BUILD_DIR)/$(2)/dist/usr/sbin/*; do $(INSTALL_BIN) $$i $(1)/usr/sbin/; done + for i in $(PKG_BUILD_DIR)/$(2)/dist/bin/*; do $(INSTALL_BIN) $$i $(1)/bin/; done + for i in $(PKG_BUILD_DIR)/$(2)/dist/sbin/*; do $(INSTALL_BIN) $$i $(1)/sbin/; done endef -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/core $(MAKE_ACTION) - $(MAKE) -C $(PKG_BUILD_DIR)/module/admin-core $(MAKE_ACTION) - $(MAKE) -C $(PKG_BUILD_DIR)/module/public-core $(MAKE_ACTION) - $(MAKE) -C $(PKG_BUILD_DIR)/module/rpc-core $(MAKE_ACTION) + +define Package/ffluci + $(call Package/ffluci/template) + MENU:=1 + DEPENDS:=+lua-luci +luaposix +luci-addons +endef + +define Package/ffluci/conffiles +/etc/config/luci endef define Package/ffluci/install - $(INSTALL_DIR) $(1)/usr/lib/lua/ffluci - $(INSTALL_DIR) $(1)/www/cgi-bin - $(INSTALL_DIR) $(1)/www/ffluci - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - - $(CP) $(PKG_BUILD_DIR)/core/dist/* $(1)/usr/lib/lua/ -R - $(CP) $(PKG_BUILD_DIR)/core/contrib/uci/* $(1)/etc/config/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/core/contrib/ffluci $(1)/www/cgi-bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/core/contrib/ffluci-upload $(1)/www/cgi-bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/core/contrib/index.cgi $(1)/www/cgi-bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/core/contrib/index.html $(1)/www - - $(CP) $(PKG_BUILD_DIR)/themes/fledermaus/contrib/media $(1)/www/ffluci/ -R - - $(CP) $(PKG_BUILD_DIR)/module/admin-core/dist/* $(1)/usr/lib/lua/ffluci/ -R - $(CP) $(PKG_BUILD_DIR)/module/admin-core/contrib/uci/luci_fw $(1)/etc/config/luci_fw - $(INSTALL_BIN) $(PKG_BUILD_DIR)/module/admin-core/contrib/init.d/luci_fw $(1)/etc/init.d/luci_fw - $(INSTALL_BIN) $(PKG_BUILD_DIR)/module/admin-core/contrib/init.d/luci_freifunk $(1)/etc/init.d/luci_freifunk - $(INSTALL_BIN) $(PKG_BUILD_DIR)/module/admin-core/contrib/ffluci-flash $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/module/admin-core/contrib/luci-splash $(1)/www/cgi-bin - - $(CP) $(PKG_BUILD_DIR)/module/public-core/dist/* $(1)/usr/lib/lua/ffluci/ -R - $(CP) $(PKG_BUILD_DIR)/module/public-core/contrib/media $(1)/www/ffluci/ -R - - $(CP) $(PKG_BUILD_DIR)/module/rpc-core/dist/* $(1)/usr/lib/lua/ffluci/ -R - - $(CP) -a ./ipkg/ffluci.postinst $(1)/CONTROL/postinst - $(CP) -a ./ipkg/conffiles $(1)/CONTROL/conffiles - rm $(DL_DIR)/$(PKG_SOURCE) -endef - -$(eval $(call BuildPackage,ffluci)) \ No newline at end of file + $(call Package/ffluci/install/template,$(1),core) + $(call Package/ffluci/install/template,$(1),themes/fledermaus) +endef + + + +### Meta Packages ### + +define Package/ffluci-freifunk-meta + $(call Package/ffluci/template) + DEPENDS:=+ffluci +ffluci-sgi-haserl +ffluci-freifunk +ffluci-firewall +ffluci-splash + TITLE:=Freifunk Meta-Package +endef + +define Package/ffluci-meta/install +endef + + +define Package/ffluci-freifunk-halle + $(call Package/ffluci/template) + DEPENDS:=+ffluci-freifunk-meta +kmod-tun + TITLE:=Community Meta-Package Halle +endef + +define Package/ffluci-freifunk-halle/install +endef + + +define Package/ffluci-freifunk-leipzig + $(call Package/ffluci/template) + DEPENDS:=+ffluci-freifunk-meta +kmod-tun + TITLE:=Community Meta-Package Leipzig +endef + +define Package/ffluci-freifunk-leipzig/install + $(call Package/ffluci/install/template,$(1),applications/community-leipzig) +endef + + + +### Modules ### + +define Package/ffluci-module-admin-core + $(call Package/ffluci/template) + DEPENDS:=+ffluci + TITLE:=Core Administrative pages for FFLuCI +endef + +define Package/ffluci-module-admin-core/install + $(call Package/ffluci/install/template,$(1),modules/admin-core) +endef + + +define Package/ffluci-module-freifunk + $(call Package/ffluci/template) + DEPENDS:=+ffluci +ffluci-module-admin-core + TITLE:=Freifunk public and configuration pages +endef + +define Package/ffluci-module-freifunk/conffiles +/etc/config/freifunk +endef + +define Package/ffluci-module-freifunk/install + $(call Package/ffluci/install/template,$(1),modules/freifunk) +endef + + + +### Applications ### + +define Package/ffluci-firewall + $(call Package/ffluci/template) + DEPENDS:=+ffluci +ffluci-module-admin-core + TITLE:=Firewall and Portforwarding module +endef + +define Package/ffluci-firewall/conffiles +/etc/config/luci_fw +endef + +define Package/ffluci-firewall/install + $(call Package/ffluci/install/template,$(1),applications/luci-fw) +endef + + +define Package/ffluci-splash + $(call Package/ffluci/template) + DEPENDS:=+ffluci +ffluci-freifunk +ffluci-sgi-haserl +iptables-mod-nat + TITLE:=Freifunk DHCP-Splash +endef + +define Package/ffluci-splash/conffiles +/etc/config/luci_splash +endef + +define Package/ffluci-splash/install + $(call Package/ffluci/install/template,$(1),applications/luci-splash) +endef + + + +### Server Gateway Interfaces ### + +define Package/ffluci-sgi-haserl + $(call Package/ffluci/template) + DEPENDS:=+ffluci +haserl-lua + TITLE:=SGI for Haserl on top of Busybox httpd +endef + +define Package/ffluci-sgi-haserl/install + $(call Package/ffluci/install/template,$(1),applications/sgi-haserl) +endef + + +define Package/ffluci-sgi-webuci + $(call Package/ffluci/template) + DEPENDS:=+ffluci + TITLE:=SGI for Webuci +endef + +define Package/ffluci-sgi-webuci/install + $(call Package/ffluci/install/template,$(1),applications/sgi-webuci) +endef + + + + +$(eval $(call BuildPackage,ffluci)) + +$(eval $(call BuildPackage,ffluci-freifunk-meta)) +$(eval $(call BuildPackage,ffluci-freifunk-halle)) +$(eval $(call BuildPackage,ffluci-freifunk-leipzig)) + +$(eval $(call BuildPackage,ffluci-module-admin-core)) +$(eval $(call BuildPackage,ffluci-module-freifunk)) + +$(eval $(call BuildPackage,ffluci-firewall)) +$(eval $(call BuildPackage,ffluci-splash)) + +$(eval $(call BuildPackage,ffluci-sgi-haserl)) +$(eval $(call BuildPackage,ffluci-sgi-webuci)) \ No newline at end of file diff --git a/contrib/package/ffluci/ipkg/conffiles b/contrib/package/ffluci/ipkg/conffiles deleted file mode 100644 index 098dbf9042..0000000000 --- a/contrib/package/ffluci/ipkg/conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/config/luci -/etc/config/luci_fw \ No newline at end of file diff --git a/contrib/package/ffluci/ipkg/ffluci-community-leipzig.postinst b/contrib/package/ffluci/ipkg/ffluci-community-leipzig.postinst new file mode 100755 index 0000000000..26eace97d9 --- /dev/null +++ b/contrib/package/ffluci/ipkg/ffluci-community-leipzig.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +[ -n "${IPKG_INSTROOT}" ] || { + ( . /etc/uci-defaults/ffluci-community-leipzig ) && rm -f /etc/uci-defaults/ffluci-community-leipzig +} diff --git a/contrib/package/ffluci/ipkg/ffluci.postinst b/contrib/package/ffluci/ipkg/ffluci-sgi-haserl.postinst similarity index 100% rename from contrib/package/ffluci/ipkg/ffluci.postinst rename to contrib/package/ffluci/ipkg/ffluci-sgi-haserl.postinst diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile new file mode 100644 index 0000000000..04562257c2 --- /dev/null +++ b/contrib/package/luci-addons/Makefile @@ -0,0 +1,37 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=luci-addons +PKG_VERSION:=0.2 +PKG_RELEASE:=1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(INCLUDE_DIR)/package.mk + + +define Build/Compile +endef + + +define Package/luci-addons + SECTION:=utils + CATEGORY:=Utilities + TITLE:=FFLuCI System Addons for Kamikaze + URL:=http://luci.freifunk-halle.net +endef + +define Package/luci-addons/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_DIR) $(1)/etc/crontabs + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface + + $(INSTALL_BIN) ./dist/usr/bin/run-parts $(1)/usr/bin + $(INSTALL_BIN) ./dist/sbin/ffluci-flash $(1)/sbin + + $(CP) ./dist/etc/crontabs/root $(1)/etc/crontabs/root + $(CP) ./dist/etc/hotplug.d/iface/20-aliases $(1)/etc/hotplug.d/iface/20-aliases +endef + +$(eval $(call BuildPackage,luci-addons)) \ No newline at end of file diff --git a/contrib/package/ffluci-system-addons/src/root.crontab b/contrib/package/luci-addons/dist/etc/crontabs/root similarity index 100% rename from contrib/package/ffluci-system-addons/src/root.crontab rename to contrib/package/luci-addons/dist/etc/crontabs/root diff --git a/contrib/package/ffluci-system-addons/src/hotplug.d-20-aliases b/contrib/package/luci-addons/dist/etc/hotplug.d/iface/20-aliases similarity index 100% rename from contrib/package/ffluci-system-addons/src/hotplug.d-20-aliases rename to contrib/package/luci-addons/dist/etc/hotplug.d/iface/20-aliases diff --git a/module/admin-core/contrib/ffluci-flash b/contrib/package/luci-addons/dist/sbin/ffluci-flash similarity index 100% rename from module/admin-core/contrib/ffluci-flash rename to contrib/package/luci-addons/dist/sbin/ffluci-flash diff --git a/contrib/package/ffluci-system-addons/src/run-parts b/contrib/package/luci-addons/dist/usr/bin/run-parts similarity index 100% rename from contrib/package/ffluci-system-addons/src/run-parts rename to contrib/package/luci-addons/dist/usr/bin/run-parts diff --git a/core/Makefile b/core/Makefile index dbebb52d9e..5e64bcd1f0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1,39 +1,2 @@ -LUAC = luac -LUAC_OPTIONS = -s - -FILES = ffluci/debug.lua ffluci/view/*.htm ffluci/view/cbi/*.htm ffluci/i18n/* - -CFILES = ffluci/bits.lua ffluci/util.lua \ -ffluci/sgi/haserl.lua ffluci/sgi/webuci.lua \ -ffluci/http.lua ffluci/fs.lua ffluci/sys.lua \ -ffluci/model/uci/wrapper.lua ffluci/model/uci/libuci.lua ffluci/model/uci.lua \ -ffluci/model/ipkg.lua ffluci/config.lua ffluci/i18n.lua ffluci/template.lua \ -ffluci/cbi.lua ffluci/dispatcher.lua ffluci/menu.lua ffluci/init.lua - -DIRECTORIES = ffluci/model/cbi ffluci/model/menu ffluci/controller ffluci/i18n ffluci/view/cbi ffluci/model/uci ffluci/sgi - -OUTDIRS = $(DIRECTORIES:%=dist/%) -INFILES = $(CFILES:%=src/%) -OUTFILE = ffluci/init.lua -CPFILES = $(FILES:%=src/%) - -.PHONY: all compile source depends clean - -all: compile - -depends: - mkdir -p $(OUTDIRS) - for i in $(CPFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done - -compile: depends - $(LUAC) $(LUAC_OPTIONS) -o dist/$(OUTFILE) $(INFILES) - for i in $(CFILES); do [ -f dist/$$i ] || ln -s `dirname $$i | cut -s -d / -f 2- | sed -e 's/[^/]*\/*/..\//g'``basename $(OUTFILE)` dist/$$i; done - - -source: depends - for i in $(CFILES); do cp src/$$i dist/$$i; done - - -clean: - rm dist -rf +include ../build/config.mk +include ../build/module.mk \ No newline at end of file diff --git a/core/contrib/uci/freifunk b/core/contrib/uci/freifunk deleted file mode 100644 index aba12e6367..0000000000 --- a/core/contrib/uci/freifunk +++ /dev/null @@ -1,26 +0,0 @@ -config public contact - option nickname - option name - option mail - option phone - option location - option geo - option note - -config public community - option name "Freifunk Halle" - option homepage http://halle.freifunk.net - option essid halle.freifunk.net - option bssid 02:CA:FF:EE:BA:BE - option realm netz.freifunk-halle.net - option channel 1 - option net 104.0.0.0 - option mask 255.0.0.0 - option dhcp 10.0.0.0 - option dhcpmask 255.255.255.0 - option dns "88.198.178.18 141.54.1.1 212.204.49.83 208.67.220.220 208.67.222.222" - -config settings routing - option internal 0 - option internet 0 - \ No newline at end of file diff --git a/core/contrib/uci/luci b/core/root/etc/config/luci similarity index 100% rename from core/contrib/uci/luci rename to core/root/etc/config/luci diff --git a/core/src/ffluci/bits.lua b/core/src/bits.lua similarity index 100% rename from core/src/ffluci/bits.lua rename to core/src/bits.lua diff --git a/core/src/ffluci/cbi.lua b/core/src/cbi.lua similarity index 100% rename from core/src/ffluci/cbi.lua rename to core/src/cbi.lua diff --git a/core/src/ffluci/config.lua b/core/src/config.lua similarity index 100% rename from core/src/ffluci/config.lua rename to core/src/config.lua diff --git a/core/src/ffluci/debug.lua b/core/src/debug.lua similarity index 100% rename from core/src/ffluci/debug.lua rename to core/src/debug.lua diff --git a/core/src/ffluci/dispatcher.lua b/core/src/dispatcher.lua similarity index 100% rename from core/src/ffluci/dispatcher.lua rename to core/src/dispatcher.lua diff --git a/core/src/ffluci/fs.lua b/core/src/fs.lua similarity index 100% rename from core/src/ffluci/fs.lua rename to core/src/fs.lua diff --git a/core/src/ffluci/http.lua b/core/src/http.lua similarity index 100% rename from core/src/ffluci/http.lua rename to core/src/http.lua diff --git a/core/src/ffluci/i18n.lua b/core/src/i18n.lua similarity index 100% rename from core/src/ffluci/i18n.lua rename to core/src/i18n.lua diff --git a/core/src/ffluci/i18n/cbi.en b/core/src/i18n/cbi.en similarity index 100% rename from core/src/ffluci/i18n/cbi.en rename to core/src/i18n/cbi.en diff --git a/core/src/ffluci/i18n/default.en b/core/src/i18n/default.en similarity index 100% rename from core/src/ffluci/i18n/default.en rename to core/src/i18n/default.en diff --git a/core/src/ffluci/init.lua b/core/src/init.lua similarity index 100% rename from core/src/ffluci/init.lua rename to core/src/init.lua diff --git a/core/src/ffluci/menu.lua b/core/src/menu.lua similarity index 100% rename from core/src/ffluci/menu.lua rename to core/src/menu.lua diff --git a/core/src/ffluci/model/ipkg.lua b/core/src/model/ipkg.lua similarity index 100% rename from core/src/ffluci/model/ipkg.lua rename to core/src/model/ipkg.lua diff --git a/core/src/ffluci/model/uci.lua b/core/src/model/uci.lua similarity index 100% rename from core/src/ffluci/model/uci.lua rename to core/src/model/uci.lua diff --git a/core/src/ffluci/model/uci/libuci.lua b/core/src/model/uci/libuci.lua similarity index 100% rename from core/src/ffluci/model/uci/libuci.lua rename to core/src/model/uci/libuci.lua diff --git a/core/src/ffluci/model/uci/wrapper.lua b/core/src/model/uci/wrapper.lua similarity index 100% rename from core/src/ffluci/model/uci/wrapper.lua rename to core/src/model/uci/wrapper.lua diff --git a/core/src/ffluci/sys.lua b/core/src/sys.lua similarity index 100% rename from core/src/ffluci/sys.lua rename to core/src/sys.lua diff --git a/core/src/ffluci/template.lua b/core/src/template.lua similarity index 100% rename from core/src/ffluci/template.lua rename to core/src/template.lua diff --git a/core/src/ffluci/util.lua b/core/src/util.lua similarity index 100% rename from core/src/ffluci/util.lua rename to core/src/util.lua diff --git a/core/src/ffluci/view/cbi/dvalue.htm b/core/src/view/cbi/dvalue.htm similarity index 100% rename from core/src/ffluci/view/cbi/dvalue.htm rename to core/src/view/cbi/dvalue.htm diff --git a/core/src/ffluci/view/cbi/footer.htm b/core/src/view/cbi/footer.htm similarity index 100% rename from core/src/ffluci/view/cbi/footer.htm rename to core/src/view/cbi/footer.htm diff --git a/core/src/ffluci/view/cbi/fvalue.htm b/core/src/view/cbi/fvalue.htm similarity index 100% rename from core/src/ffluci/view/cbi/fvalue.htm rename to core/src/view/cbi/fvalue.htm diff --git a/core/src/ffluci/view/cbi/header.htm b/core/src/view/cbi/header.htm similarity index 100% rename from core/src/ffluci/view/cbi/header.htm rename to core/src/view/cbi/header.htm diff --git a/core/src/ffluci/view/cbi/lvalue.htm b/core/src/view/cbi/lvalue.htm similarity index 100% rename from core/src/ffluci/view/cbi/lvalue.htm rename to core/src/view/cbi/lvalue.htm diff --git a/core/src/ffluci/view/cbi/map.htm b/core/src/view/cbi/map.htm similarity index 100% rename from core/src/ffluci/view/cbi/map.htm rename to core/src/view/cbi/map.htm diff --git a/core/src/ffluci/view/cbi/mvalue.htm b/core/src/view/cbi/mvalue.htm similarity index 100% rename from core/src/ffluci/view/cbi/mvalue.htm rename to core/src/view/cbi/mvalue.htm diff --git a/core/src/ffluci/view/cbi/nsection.htm b/core/src/view/cbi/nsection.htm similarity index 100% rename from core/src/ffluci/view/cbi/nsection.htm rename to core/src/view/cbi/nsection.htm diff --git a/core/src/ffluci/view/cbi/tsection.htm b/core/src/view/cbi/tsection.htm similarity index 100% rename from core/src/ffluci/view/cbi/tsection.htm rename to core/src/view/cbi/tsection.htm diff --git a/core/src/ffluci/view/cbi/ucisection.htm b/core/src/view/cbi/ucisection.htm similarity index 100% rename from core/src/ffluci/view/cbi/ucisection.htm rename to core/src/view/cbi/ucisection.htm diff --git a/core/src/ffluci/view/cbi/value.htm b/core/src/view/cbi/value.htm similarity index 100% rename from core/src/ffluci/view/cbi/value.htm rename to core/src/view/cbi/value.htm diff --git a/core/src/ffluci/view/cbi/valuefooter.htm b/core/src/view/cbi/valuefooter.htm similarity index 100% rename from core/src/ffluci/view/cbi/valuefooter.htm rename to core/src/view/cbi/valuefooter.htm diff --git a/core/src/ffluci/view/cbi/valueheader.htm b/core/src/view/cbi/valueheader.htm similarity index 100% rename from core/src/ffluci/view/cbi/valueheader.htm rename to core/src/view/cbi/valueheader.htm diff --git a/core/src/ffluci/view/error404.htm b/core/src/view/error404.htm similarity index 100% rename from core/src/ffluci/view/error404.htm rename to core/src/view/error404.htm diff --git a/core/src/ffluci/view/error500.htm b/core/src/view/error500.htm similarity index 100% rename from core/src/ffluci/view/error500.htm rename to core/src/view/error500.htm diff --git a/core/src/ffluci/view/footer.htm b/core/src/view/footer.htm similarity index 100% rename from core/src/ffluci/view/footer.htm rename to core/src/view/footer.htm diff --git a/core/src/ffluci/view/header.htm b/core/src/view/header.htm similarity index 100% rename from core/src/ffluci/view/header.htm rename to core/src/view/header.htm diff --git a/module/admin-core/Makefile b/module/admin-core/Makefile deleted file mode 100644 index 708c1c2398..0000000000 --- a/module/admin-core/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -LUAC = luac -LUAC_OPTIONS = -s - -FILES = i18n/* view/*/*.htm - -CFILES = controller/*/*.lua model/cbi/*/*.lua model/menu/*.lua - -DIRECTORIES = model/cbi model/menu controller i18n view - - -INFILES = $(CFILES:%=src/%) -OUTDIRS = $(DIRECTORIES:%=dist/%) -CPFILES = $(FILES:%=src/%) - -.PHONY: all compile source clean depends - -all: compile - -depends: - mkdir -p $(OUTDIRS) - for i in $(CPFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done - -compile: depends - for i in $(INFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); $(LUAC) $(LUAC_OPTIONS) -o dist/$$i src/$$i; fi; done - -source: depends - for i in $(INFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done - - -clean: - rm dist -rf diff --git a/module/admin-core/contrib/init.d/luci_freifunk b/module/admin-core/contrib/init.d/luci_freifunk deleted file mode 100644 index 38779cb8ba..0000000000 --- a/module/admin-core/contrib/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/module/admin-core/src/controller/admin/index.lua b/module/admin-core/src/controller/admin/index.lua deleted file mode 100644 index edca5721ee..0000000000 --- a/module/admin-core/src/controller/admin/index.lua +++ /dev/null @@ -1,171 +0,0 @@ -module("ffluci.controller.admin.index", package.seeall) - -function action_wizard() - if ffluci.http.formvalue("ip") then - return configure_freifunk() - end - - local ifaces = {} - local wldevs = ffluci.model.uci.sections("wireless") - - if wldevs then - for k, v in pairs(wldevs) do - if v[".type"] == "wifi-device" then - table.insert(ifaces, k) - end - end - end - - ffluci.template.render("admin_index/wizard", {ifaces=ifaces}) -end - -function configure_freifunk() - local ip = ffluci.http.formvalue("ip") - local uci = ffluci.model.uci.Session() - - -- Load UCI - uci:t_load("network") - uci:t_load("dhcp") - uci:t_load("freifunk") - uci:t_load("luci_splash") - uci:t_load("olsr") - uci:t_load("wireless") - - - -- Configure FF-Interface - uci:t_del("network", "ff") - uci:t_del("network", "ffdhcp") - - uci:t_set("network", "ff", nil, "interface") - uci:t_set("network", "ff", "type", "bridge") - uci:t_set("network", "ff", "proto", "static") - uci:t_set("network", "ff", "ipaddr", ip) - uci:t_set("network", "ff", "netmask", uci:t_get("freifunk", "community", "mask")) - uci:t_set("network", "ff", "dns", uci:t_get("freifunk", "community", "dns")) - - -- Enable internal routing - uci:t_set("freifunk", "routing", "internal", "1") - - -- Enable internet routing - if ffluci.http.formvalue("shareinet") then - uci:t_set("freifunk", "routing", "internet", "1") - else - uci:t_set("freifunk", "routing", "internet", "0") - end - - -- Configure DHCP - if ffluci.http.formvalue("dhcp") then - local dhcpnet = uci:t_get("freifunk", "community", "dhcp"):match("^([0-9]+)") - local dhcpip = ip:gsub("^[0-9]+", dhcpnet) - - uci:t_set("network", "ffdhcp", nil, "interface") - uci:t_set("network", "ffdhcp", "proto", "static") - uci:t_set("network", "ffdhcp", "ifname", "br-ff:dhcp") - uci:t_set("network", "ffdhcp", "ipaddr", dhcpip) - uci:t_set("network", "ffdhcp", "netmask", uci:t_get("freifunk", "community", "dhcpmask")) - - local dhcp = uci:t_sections("dhcp") - if dhcp then - for k, v in pairs(dhcp) do - if v[".type"] == "dhcp" and v.interface == "ffdhcp" then - uci:t_del("dhcp", k) - end - end - - local dhcpbeg = 48 + tonumber(ip:match("[0-9]+$")) * 4 - - local sk = uci:t_add("dhcp", "dhcp") - uci:t_set("dhcp", sk, "interface", "ffdhcp") - uci:t_set("dhcp", sk, "start", dhcpbeg) - uci:t_set("dhcp", sk, "limit", (dhcpbeg < 252) and 3 or 2) - uci:t_set("dhcp", sk, "leasetime", "30m") - end - - local splash = uci:t_sections("luci_splash") - if splash then - for k, v in pairs(splash) do - if v[".type"] == "iface" then - uci:t_del("luci_splash", k) - end - end - - local sk = uci:t_add("luci_splash", "iface") - uci:t_set("luci_splash", sk, "network", "ffdhcp") - end - end - - -- Configure OLSR - if ffluci.http.formvalue("olsr") and uci:t_sections("olsr") then - for k, v in pairs(uci:t_sections("olsr")) do - if v[".type"] == "Interface" or v[".type"] == "LoadPlugin" then - uci:t_del("olsr", k) - end - end - - if ffluci.http.formvalue("shareinet") then - uci:t_set("olsr", "dyn_gw", nil, "LoadPlugin") - uci:t_set("olsr", "dyn_gw", "Library", "olsrd_dyn_gw.so.0.4") - end - - uci:t_set("olsr", "nameservice", nil, "LoadPlugin") - uci:t_set("olsr", "nameservice", "Library", "olsrd_nameservice.so.0.3") - uci:t_set("olsr", "nameservice", "name", ip:gsub("%.", "-")) - uci:t_set("olsr", "nameservice", "hosts_file", "/var/etc/hosts") - uci:t_set("olsr", "nameservice", "suffix", ".olsr") - uci:t_set("olsr", "nameservice", "latlon_infile", "/tmp/latlon.txt") - - uci:t_set("olsr", "txtinfo", nil, "LoadPlugin") - uci:t_set("olsr", "txtinfo", "Library", "olsrd_txtinfo.so.0.1") - uci:t_set("olsr", "txtinfo", "Accept", "127.0.0.1") - - local oif = uci:t_add("olsr", "Interface") - uci:t_set("olsr", oif, "Interface", "ff") - uci:t_set("olsr", oif, "HelloInterval", "6.0") - uci:t_set("olsr", oif, "HelloValidityTime", "108.0") - uci:t_set("olsr", oif, "TcInterval", "4.0") - uci:t_set("olsr", oif, "TcValidityTime", "324.0") - uci:t_set("olsr", oif, "MidInterval", "18.0") - uci:t_set("olsr", oif, "MidValidityTime", "324.0") - uci:t_set("olsr", oif, "HnaInterval", "18.0") - uci:t_set("olsr", oif, "HnaValidityTime", "108.0") - end - - -- Configure Wifi - local wcfg = uci:t_sections("wireless") - if wcfg then - for iface, v in pairs(wcfg) do - if v[".type"] == "wifi-device" and ffluci.http.formvalue("wifi."..iface) then - -- Cleanup - for k, j in pairs(wcfg) do - if j[".type"] == "wifi-iface" and j.device == iface then - uci:t_del("wireless", k) - end - end - - uci:t_set("wireless", iface, "disabled", "0") - uci:t_set("wireless", iface, "mode", "11g") - uci:t_set("wireless", iface, "txantenna", 1) - uci:t_set("wireless", iface, "rxantenna", 1) - uci:t_set("wireless", iface, "channel", uci:t_get("freifunk", "community", "channel")) - - local wif = uci:t_add("wireless", "wifi-iface") - uci:t_set("wireless", wif, "device", iface) - uci:t_set("wireless", wif, "network", "ff") - uci:t_set("wireless", wif, "mode", "adhoc") - uci:t_set("wireless", wif, "ssid", uci:t_get("freifunk", "community", "essid")) - uci:t_set("wireless", wif, "bssid", uci:t_get("freifunk", "community", "bssid")) - uci:t_set("wireless", wif, "txpower", 13) - end - end - end - - -- Save UCI - uci:t_save("network") - uci:t_save("dhcp") - uci:t_save("freifunk") - uci:t_save("luci_splash") - uci:t_save("olsr") - uci:t_save("wireless") - - ffluci.http.redirect(ffluci.dispatcher.build_url("admin", "uci", "changes")) -end \ No newline at end of file diff --git a/module/admin-core/src/model/cbi/admin_index/contact.lua b/module/admin-core/src/model/cbi/admin_index/contact.lua deleted file mode 100644 index 66a1ec4bde..0000000000 --- a/module/admin-core/src/model/cbi/admin_index/contact.lua +++ /dev/null @@ -1,18 +0,0 @@ --- Todo: Translate -m = Map("freifunk", translate("contact", "Kontakt"), translate("contact1", [[Diese Daten sind -auf der öffentlichen Kontaktseite sichtbar. Bitte gib an, wie man dich am besten kontaktieren kann. -Diese Informationen sollten nach der Picopeering Vereinbarung mindestens deine E-Mail-Adresse enthalten. -Damit dein Knoten durch Topographieprogramme erfasst werden kann, gib bitte deine Geokoordinaten oder -zumindest deine Straße und Hausnummer unter Standort an.]])) - -c = m:section(NamedSection, "contact", "public") - -c:option(Value, "nickname", translate("nickname", "Pseudonym")) -c:option(Value, "name", translate("name", "Name")) -c:option(Value, "mail", translate("mail", "E-Mail"), translate("mail1", "Bitte unbedingt angeben!")) -c:option(Value, "phone", translate("phone", "Telefon")) -c:option(Value, "location", translate("location", "Standort")) -c:option(Value, "geo", translate("coord", "Koordinaten"), translate("coord1", "Bitte als Breite;Länge (z.B: 51.5;12.9) angeben")) -c:option(Value, "note", translate("note", "Notiz")) - -return m \ No newline at end of file diff --git a/module/admin-core/src/model/cbi/admin_index/freifunk.lua b/module/admin-core/src/model/cbi/admin_index/freifunk.lua deleted file mode 100644 index ec4d100b87..0000000000 --- a/module/admin-core/src/model/cbi/admin_index/freifunk.lua +++ /dev/null @@ -1,23 +0,0 @@ --- 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.]]) -c:option(Value, "name", "Gemeinschaft") -c:option(Value, "homepage", "Webseite") -c:option(Value, "essid", "ESSID") -c:option(Value, "bssid", "BSSID") -c:option(Value, "channel", "Funkkanal") -c:option(Value, "realm", "Realm") -c:option(Value, "net", "Adressbereich") -c:option(Value, "mask", "Netzmaske") -c:option(Value, "dns", "DNS-Server") -c:option(Value, "dhcp", "DHCP-Bereich") -c:option(Value, "dhcpmask", "DHCP-Maske") - -return m \ No newline at end of file diff --git a/module/public-core/Makefile b/module/public-core/Makefile deleted file mode 100644 index 113799af6c..0000000000 --- a/module/public-core/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -LUAC = luac -LUAC_OPTIONS = -s - -FILES = i18n/* view/*/*.htm - -CFILES = controller/*/*.lua model/cbi/*/*.lua model/menu/*.lua - -DIRECTORIES = model/cbi model/menu controller i18n view - - -INFILES = $(CFILES:%=src/%) -OUTDIRS = $(DIRECTORIES:%=dist/%) -CPFILES = $(FILES:%=src/%) - -.PHONY: all compile source clean depends - -all: compile - - -depends: - mkdir -p $(OUTDIRS) - for i in $(CPFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done - -compile: depends - for i in $(INFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); $(LUAC) $(LUAC_OPTIONS) -o dist/$$i src/$$i; fi; done - -source: depends - for i in $(INFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done - - -clean: - rm dist -rf diff --git a/module/public-core/src/controller/public/index.lua b/module/public-core/src/controller/public/index.lua deleted file mode 100644 index f65478c05f..0000000000 --- a/module/public-core/src/controller/public/index.lua +++ /dev/null @@ -1 +0,0 @@ -module("ffluci.controller.public.index", package.seeall) \ No newline at end of file diff --git a/module/public-core/src/controller/public/olsr.lua b/module/public-core/src/controller/public/olsr.lua deleted file mode 100644 index d41f5ed41d..0000000000 --- a/module/public-core/src/controller/public/olsr.lua +++ /dev/null @@ -1,137 +0,0 @@ -module("ffluci.controller.public.olsr", package.seeall) -require("ffluci.sys") - -function action_index() - local data = fetch_txtinfo("links") - - if not data or not data.Links then - ffluci.template.render("public_olsr/error_olsr") - return nil - end - - local function compare(a, b) - if tonumber(a.ETX) == 0 then - return false - end - - if tonumber(b.ETX) == 0 then - return true - end - - return tonumber(a.ETX) < tonumber(b.ETX) - end - - table.sort(data.Links, compare) - - ffluci.template.render("public_olsr/index", {links=data.Links}) -end - -function action_routes() - local data = fetch_txtinfo("routes") - - if not data or not data.Routes then - ffluci.template.render("public_olsr/error_olsr") - return nil - end - - local function compare(a, b) - if tonumber(a.ETX) == 0 then - return false - end - - if tonumber(b.ETX) == 0 then - return true - end - - return tonumber(a.ETX) < tonumber(b.ETX) - end - - table.sort(data.Routes, compare) - - ffluci.template.render("public_olsr/routes", {routes=data.Routes}) -end - -function action_topology() - local data = fetch_txtinfo("topology") - - if not data or not data.Topology then - ffluci.template.render("public_olsr/error_olsr") - return nil - end - - local function compare(a, b) - return a["Destination IP"] < b["Destination IP"] - end - - table.sort(data.Topology, compare) - - ffluci.template.render("public_olsr/topology", {routes=data.Topology}) -end - -function action_hna() - local data = fetch_txtinfo("hna") - - if not data or not data.HNA then - ffluci.template.render("public_olsr/error_olsr") - return nil - end - - local function compare(a, b) - return a.Network < b.Network - end - - table.sort(data.HNA, compare) - - ffluci.template.render("public_olsr/hna", {routes=data.HNA}) -end - -function action_mid() - local data = fetch_txtinfo("mid") - - if not data or not data.MID then - ffluci.template.render("public_olsr/error_olsr") - return nil - end - - local function compare(a, b) - return a.IP < b.IP - end - - table.sort(data.MID, compare) - - ffluci.template.render("public_olsr/mid", {mids=data.MID}) -end - - --- Internal -function fetch_txtinfo(otable) - otable = otable or "" - local rawdata = ffluci.sys.httpget("http://127.0.0.1:2006/"..otable) - - if #rawdata == 0 then - return nil - end - - local data = {} - - local tables = ffluci.util.split(ffluci.util.trim(rawdata), "\n\n") - - - for i, tbl in ipairs(tables) do - local lines = ffluci.util.split(tbl, "\n") - local name = table.remove(lines, 1):sub(8) - local keys = ffluci.util.split(table.remove(lines, 1), "\t") - - data[name] = {} - - for j, line in ipairs(lines) do - local fields = ffluci.util.split(line, "\t") - data[name][j] = {} - for k, key in pairs(keys) do - data[name][j][key] = fields[k] - end - end - end - - return data -end \ No newline at end of file diff --git a/module/public-core/src/controller/public/status.lua b/module/public-core/src/controller/public/status.lua deleted file mode 100644 index 8d2f7a303f..0000000000 --- a/module/public-core/src/controller/public/status.lua +++ /dev/null @@ -1,21 +0,0 @@ -module("ffluci.controller.public.status", package.seeall) - -function action_index() - local data = {} - - data.s, data.m, data.r = ffluci.sys.sysinfo() - - data.wifi = ffluci.sys.wifi.getiwconfig() - - data.routes = {} - for i, r in pairs(ffluci.sys.net.routes()) do - if r.Destination == "00000000" then - table.insert(data.routes, r) - end - end - - - ffluci.template.render("public_status/index", data) -end - - diff --git a/module/public-core/src/controller/sudo/status.lua b/module/public-core/src/controller/sudo/status.lua deleted file mode 100644 index fd5127d2cf..0000000000 --- a/module/public-core/src/controller/sudo/status.lua +++ /dev/null @@ -1 +0,0 @@ -module("ffluci.controller.sudo.status", package.seeall) \ No newline at end of file diff --git a/module/public-core/src/model/menu/00public.lua b/module/public-core/src/model/menu/00public.lua deleted file mode 100644 index 644aa44f78..0000000000 --- a/module/public-core/src/model/menu/00public.lua +++ /dev/null @@ -1,12 +0,0 @@ -add("public", "index", "Übersicht", 10) -act("contact", "Kontakt") - -add("public", "status", "Status", 20) -act("routes", "Routingtabelle") -act("iwscan", "WLAN-Scan") - -add("public", "olsr", "OLSR", 30) -act("routes", "Routen") -act("topology", "Topologie") -act("hna", "HNA") -act("mid", "MID") diff --git a/module/public-core/src/view/public_index/contact.htm b/module/public-core/src/view/public_index/contact.htm deleted file mode 100644 index 221dc89ccc..0000000000 --- a/module/public-core/src/view/public_index/contact.htm +++ /dev/null @@ -1,13 +0,0 @@ -<%+header%> -<% local contact = ffluci.model.uci.sections("freifunk").contact %> -

<%:contact Kontakt%>

- - - - - - - - -
<%:nickname Pseudonym%>:<%=contact.nickname%>
<%:name Name%>:<%=contact.name%>
<%:mail E-Mail%>:<%=contact.mail%>
<%:phone Telefon%>:<%=contact.phone%>
<%:location Standort%>:<%=contact.location%>
<%:geocoord Geokoordinaten%>:<%=contact.geo%>
<%:note Notiz%>:<%=contact.note%>
-<%+footer%> \ No newline at end of file diff --git a/module/public-core/src/view/public_index/index.htm b/module/public-core/src/view/public_index/index.htm deleted file mode 100644 index 6c7fe85883..0000000000 --- a/module/public-core/src/view/public_index/index.htm +++ /dev/null @@ -1,11 +0,0 @@ -<%+header%> -<% local ff = ffluci.model.uci.sections("freifunk") %> -

<%:hellonet Hallo und willkommen im Netz von%> <%=ff.community.name%>!

-

<%:public1 Wir sind eine Initiative zur Schaffung eines freien, offenen und unabhängigen Funknetzwerks auf WLAN-Basis.%>
-<%:public2 Dies ist der Zugangspunkt %><%=ffluci.sys.hostname()%>. <%:public3 Er wird betrieben von %> -<%=ff.contact.nickname%>.

-

<%:public4 Weitere Informationen zur globalen Freifunkinitiative findest du unter%> Freifunk.net.
-<%:public5 Hast du Interesse an diesem Projekt, dann wende dich an deine lokale Gemeinschaft%> <%=ff.community.name%>.

-

<%:note Hinweis%>: <%:public6 Der Internetzugang über das experimentelle Freifunknetz ist an technische und organisatorische Bedingungen geknüpft und deshalb möglicherweise -nicht (immer) gewährleistet.%>

-<%+footer%> \ No newline at end of file diff --git a/module/public-core/src/view/public_olsr/error_olsr.htm b/module/public-core/src/view/public_olsr/error_olsr.htm deleted file mode 100644 index 25426f50d7..0000000000 --- a/module/public-core/src/view/public_olsr/error_olsr.htm +++ /dev/null @@ -1,6 +0,0 @@ -<%+header%> -

<%:olsr OLSR%>

-

<%:olsrerror1 Es konnte keine Verbindung zum OLSR-Daemon hergestellt werden!%>

-

<%:olsrerror2 Um die Statusinformationen abfragen zu können muss der OLSR-Daemon gestartet -und das Plugin "txtinfo" geladen sein.%>

-<%+footer%> \ No newline at end of file diff --git a/module/public-core/src/view/public_olsr/hna.htm b/module/public-core/src/view/public_olsr/hna.htm deleted file mode 100644 index c13369f426..0000000000 --- a/module/public-core/src/view/public_olsr/hna.htm +++ /dev/null @@ -1,17 +0,0 @@ -<%+header%> -

<%:olsrhna OLSR-HNA%>

-
- - - - - -<% for k, route in ipairs(routes) do %> - - - - -<% end %> -
<%:destination Ziel%><%:gateway Gateway%>
<%=route.Network%>/<%=route.Netmask%><%=route.Gateway%>
-
-<%+footer%> \ No newline at end of file diff --git a/module/public-core/src/view/public_olsr/index.htm b/module/public-core/src/view/public_olsr/index.htm deleted file mode 100644 index 0633d1f456..0000000000 --- a/module/public-core/src/view/public_olsr/index.htm +++ /dev/null @@ -1,43 +0,0 @@ -<%+header%> -

<%:olsrlinks OLSR-Verbindungen%>

-

<%:olsrlinks1 Übersicht über aktuell bestehende OLSR-Verbindungen%>

-
- - - - - - - - -<% for k, link in ipairs(links) do - local color = "#bb3333" - - link.ETX = tonumber(link.ETX) - if link.ETX == 0 then - color = "#bb3333" - elseif link.ETX < 4 then - color = "#00cc00" - elseif link.ETX < 10 then - color = "#ffcb05" - elseif link.ETX < 100 then - color = "#ff6600" - end -%> - - - - - - - -<% end %> -
<%:destination Ziel%><%:local Lokal%>LQNLQETX
"><%=link["remote IP"]%><%=link["Local IP"]%><%=link.LinkQuality%><%=link.NLQ%><%=link.ETX%>
-
-

<%:legend Legende%>:

-
    -
  • LQ: <%:lq1 Erfolgsquote gesendeter Pakete%>
    • -
  • NLQ: <%:nlq1 Erfolgsquote empfangener Pakete%>
    • -
  • ETX: <%:etx1 Zu erwartende Sendeversuche pro Paket%>
    • -
-<%+footer%> \ No newline at end of file diff --git a/module/public-core/src/view/public_olsr/mid.htm b/module/public-core/src/view/public_olsr/mid.htm deleted file mode 100644 index 6553237ea5..0000000000 --- a/module/public-core/src/view/public_olsr/mid.htm +++ /dev/null @@ -1,17 +0,0 @@ -<%+header%> -

<%:olsrmid OLSR-MID%>

-
- - - - - -<% for k, mid in ipairs(mids) do %> - - - - -<% end %> -
<%:node Knoten%><%:aliases Aliasse%>
<%=mid.IP%><%=mid.Aliases%>
-
-<%+footer%> \ No newline at end of file diff --git a/module/public-core/src/view/public_olsr/routes.htm b/module/public-core/src/view/public_olsr/routes.htm deleted file mode 100644 index f3a0fd3366..0000000000 --- a/module/public-core/src/view/public_olsr/routes.htm +++ /dev/null @@ -1,36 +0,0 @@ -<%+header%> -

<%:olsrlinks OLSR-Routen%>

-
- - - - - - - - -<% for k, route in ipairs(routes) do - local color = "#bb3333" - - route.ETX = tonumber(route.ETX) - if route.ETX == 0 then - color = "#bb3333" - elseif route.ETX < 4 then - color = "#00cc00" - elseif route.ETX < 10 then - color = "#ffcb05" - elseif route.ETX < 100 then - color = "#ff6600" - end -%> - - - - - - - -<% end %> -
<%:destination Ziel%><%:gateway Gateway%><%:interface Schnittstelle%><%:metric Metrik%>ETX
<%=route.Destination%><%=route.Gateway%><%=route.Interface%><%=route.Metric%><%=route.ETX%>
-
-<%+footer%> \ No newline at end of file diff --git a/module/public-core/src/view/public_olsr/topology.htm b/module/public-core/src/view/public_olsr/topology.htm deleted file mode 100644 index c622026d48..0000000000 --- a/module/public-core/src/view/public_olsr/topology.htm +++ /dev/null @@ -1,23 +0,0 @@ -<%+header%> -

<%:olsrtopo OLSR-Topologie%>

-
- - - - - - - - -<% for k, route in ipairs(routes) do %> - - - - - - - -<% end %> -
<%:destination Ziel%><%:lasthop Letzter Router%>LQILQETX
"><%=route["Destination IP"]%>"><%=route["Last hop IP"]%><%=route.LQ%><%=route.ILQ%><%=route.ETX%>
-
-<%+footer%> \ No newline at end of file diff --git a/module/public-core/src/view/public_status/index.htm b/module/public-core/src/view/public_status/index.htm deleted file mode 100644 index be0b96888b..0000000000 --- a/module/public-core/src/view/public_status/index.htm +++ /dev/null @@ -1,59 +0,0 @@ -<%+header%> -

<%:status Status%>

-

<%:system System%>

- -
- - - - - - - - - - - - - -
<%:system_type Systemtyp%>:<%=s%>
<%:cpu Prozessor%>:<%=m%>
<%:ram Hauptspeicher%>:<%=r%>
-

- -

<%:wifi Drahtlos%>

-
- - - - - - - - - - - - - -<%=ffluci.sys.httpget("http://127.0.0.1" .. controller .. "/sudo/status/iwconfig")%> -
<%:name Name%><%:protocol Protokoll%><%:frequency Frequenz%><%:power Leistung%><%:bitrate Bitrate%><%:rts RTS%><%:frag Frag.%><%:link Verb.%><%:signal Signal%><%:noise Rausch%>
-
-
-

<%:defroutes Standardrouten%>

-
- - - - - - -<% -for i, rt in pairs(routes) do -%> - - -<% end %> -
<%:gateway Gateway%><%:metric Metrik%><%:iface Schnittstelle%>
<%=ffluci.sys.net.hexip4(rt.Gateway)%> -<%=rt.Metric%> -<%=rt.Iface%> -
-<%+footer%> \ No newline at end of file diff --git a/module/public-core/src/view/public_status/iwscan.htm b/module/public-core/src/view/public_status/iwscan.htm deleted file mode 100644 index a8924c8925..0000000000 --- a/module/public-core/src/view/public_status/iwscan.htm +++ /dev/null @@ -1,21 +0,0 @@ -<%+header%> -

<%:iwscan WLAN-Scan%>

-

<%:iwscan1 Drahtlosnetzwerke in der lokalen Umgebung des Routers:%>

- -
- - - - - - - - - - - - -<%=ffluci.sys.httpget("http://127.0.0.1" .. controller .. "/sudo/status/iwscan")%> -
<%:interface Schnittstelle%><%:essid ESSID%><%:bssid BSSID%><%:mode Modus%><%:channel Kanal%><%:encr Vers.%><%:link Verb.%><%:signal Signal%><%:noise Rausch%>
-
-<%+footer%> \ No newline at end of file diff --git a/module/public-core/src/view/public_status/routes.htm b/module/public-core/src/view/public_status/routes.htm deleted file mode 100644 index 85b02212d7..0000000000 --- a/module/public-core/src/view/public_status/routes.htm +++ /dev/null @@ -1,28 +0,0 @@ -<%+header%> -

<%:routes Routen%>

- -
- - - - - - - - -<% -local routes = ffluci.sys.net.routes() - -for i, r in pairs(routes) do -%> - - - - - - - -<% end %> -
<%:target Ziel%><%:netmask Netzmaske%><%:gateway Gateway%><%:metric Metrik%><%:iface Schnittstelle%>
<%=ffluci.sys.net.hexip4(r.Destination)%><%=ffluci.sys.net.hexip4(r.Mask)%><%=ffluci.sys.net.hexip4(r.Gateway)%><%=r.Metric%><%=r.Iface%>
-
-<%+footer%> \ No newline at end of file diff --git a/module/public-core/src/view/sudo_status/iwconfig.htm b/module/public-core/src/view/sudo_status/iwconfig.htm deleted file mode 100644 index 6f5dede700..0000000000 --- a/module/public-core/src/view/sudo_status/iwconfig.htm +++ /dev/null @@ -1,21 +0,0 @@ -<% -ffluci.http.prepare_content("text/plain") -for k, v in pairs(ffluci.sys.wifi.getiwconfig()) do -%> - -<%=k%> -<%=v[1]%> -<%=v.Frequency%> -<%=v["Tx-Power"]%> -<%=v["Bit Rate"]%> -<%=v["RTS thr"]%> -<%=v["Fragment thr"]%> -<%=v["Link Quality"]%> -<%=v["Signal level"]%> -<%=v["Noise level"]%> - - -ESSID: <%=v.ESSID%> -BSSID: <%=(v.Cell or v["Access Point"])%> - -<%end%> diff --git a/module/public-core/src/view/sudo_status/iwscan.htm b/module/public-core/src/view/sudo_status/iwscan.htm deleted file mode 100644 index 6f321ae9e2..0000000000 --- a/module/public-core/src/view/sudo_status/iwscan.htm +++ /dev/null @@ -1,22 +0,0 @@ -<% -ffluci.http.prepare_content("text/plain") -for iface, cells in pairs(ffluci.sys.wifi.iwscan()) do - for i, cell in ipairs(cells) do -%> - -<%=iface%> -<%=cell.ESSID%> -<%=cell.Address%> -<%=cell.Mode%> -<%=(cell.Channel or cell.Frequency or "")%> -<%=cell["Encryption key"]%> -<%=cell.Quality%> -<%=cell["Signal level"]%> -<%=cell["Noise level"]%> - -<% - end -end -%> - - diff --git a/module/rpc-core/Makefile b/module/rpc-core/Makefile deleted file mode 100644 index 113799af6c..0000000000 --- a/module/rpc-core/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -LUAC = luac -LUAC_OPTIONS = -s - -FILES = i18n/* view/*/*.htm - -CFILES = controller/*/*.lua model/cbi/*/*.lua model/menu/*.lua - -DIRECTORIES = model/cbi model/menu controller i18n view - - -INFILES = $(CFILES:%=src/%) -OUTDIRS = $(DIRECTORIES:%=dist/%) -CPFILES = $(FILES:%=src/%) - -.PHONY: all compile source clean depends - -all: compile - - -depends: - mkdir -p $(OUTDIRS) - for i in $(CPFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done - -compile: depends - for i in $(INFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); $(LUAC) $(LUAC_OPTIONS) -o dist/$$i src/$$i; fi; done - -source: depends - for i in $(INFILES); do if [ -f "$$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done - - -clean: - rm dist -rf diff --git a/module/rpc-core/src/controller/rpc/luciinfo.lua b/module/rpc-core/src/controller/rpc/luciinfo.lua deleted file mode 100644 index 611423fbb0..0000000000 --- a/module/rpc-core/src/controller/rpc/luciinfo.lua +++ /dev/null @@ -1,41 +0,0 @@ -module("ffluci.controller.rpc.luciinfo", package.seeall) - -function action_index() - local uci = ffluci.model.uci.StateSession() - - ffluci.http.prepare_content("text/plain") - - -- General - print("luciinfo.api=1") - print("luciinfo.version=" .. tostring(ffluci.__version__)) - - -- Sysinfo - local s, m, r = ffluci.sys.sysinfo() - local dr = ffluci.sys.net.defaultroute() - dr = dr and ffluci.sys.net.hexip4(dr.Gateway) or "" - local l1, l5, l15 = ffluci.sys.loadavg() - - print("sysinfo.system=" .. sanitize(s)) - print("sysinfo.cpu=" .. sanitize(m)) - print("sysinfo.ram=" .. sanitize(r)) - print("sysinfo.hostname=" .. sanitize(ffluci.sys.hostname())) - print("sysinfo.load1=" .. tostring(l1)) - print("sysinfo.load5=" .. tostring(l5)) - print("sysinfo.load15=" .. tostring(l15)) - print("sysinfo.defaultgw=" .. dr) - - - -- Freifunk - local ff = uci:sections("freifunk") or {} - for k, v in pairs(ff) do - if k:sub(1, 1) ~= "." then - for i, j in pairs(v) do - print("freifunk." .. k .. "." .. i .. "=" .. j) - end - end - end -end - -function sanitize(val) - return val:gsub("\n", "\t") -end \ No newline at end of file diff --git a/modules/admin-core/Makefile b/modules/admin-core/Makefile new file mode 100644 index 0000000000..81a96f6a83 --- /dev/null +++ b/modules/admin-core/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk \ No newline at end of file diff --git a/modules/admin-core/src/controller/admin/index.lua b/modules/admin-core/src/controller/admin/index.lua new file mode 100644 index 0000000000..b4a7720f8b --- /dev/null +++ b/modules/admin-core/src/controller/admin/index.lua @@ -0,0 +1 @@ +module("ffluci.controller.admin.index", package.seeall) \ No newline at end of file diff --git a/module/admin-core/src/controller/admin/network.lua b/modules/admin-core/src/controller/admin/network.lua similarity index 100% rename from module/admin-core/src/controller/admin/network.lua rename to modules/admin-core/src/controller/admin/network.lua diff --git a/module/admin-core/src/controller/admin/services.lua b/modules/admin-core/src/controller/admin/services.lua similarity index 100% rename from module/admin-core/src/controller/admin/services.lua rename to modules/admin-core/src/controller/admin/services.lua diff --git a/module/admin-core/src/controller/admin/system.lua b/modules/admin-core/src/controller/admin/system.lua similarity index 100% rename from module/admin-core/src/controller/admin/system.lua rename to modules/admin-core/src/controller/admin/system.lua diff --git a/module/admin-core/src/controller/admin/uci.lua b/modules/admin-core/src/controller/admin/uci.lua similarity index 100% rename from module/admin-core/src/controller/admin/uci.lua rename to modules/admin-core/src/controller/admin/uci.lua diff --git a/module/admin-core/src/controller/admin/wifi.lua b/modules/admin-core/src/controller/admin/wifi.lua similarity index 100% rename from module/admin-core/src/controller/admin/wifi.lua rename to modules/admin-core/src/controller/admin/wifi.lua diff --git a/module/admin-core/src/i18n/admin_index.en b/modules/admin-core/src/i18n/admin_index.en similarity index 69% rename from module/admin-core/src/i18n/admin_index.en rename to modules/admin-core/src/i18n/admin_index.en index 652627ab0e..6a48775233 100644 --- a/module/admin-core/src/i18n/admin_index.en +++ b/modules/admin-core/src/i18n/admin_index.en @@ -1,4 +1,3 @@ -contact = "Contact" luci = "User Interface" hello = "Hello!" @@ -11,18 +10,6 @@ to your feedback and suggestions.]] admin6 = "And now have fun with your router!" team = "The FFLuCI Team" -contact1 = [[This information will be available on the public contact page. -As stated in the Picopeering Agreement you should at least enter your e-mail address. -To display your router on any topography map, please enter your geographical coordinates or at least -your street and house number in the location field.]] -nickname = "Nickname" -mail1 = "This field is essential!" -phone = "Phone" -location = "Location" -coord = "Coordinates" -coord1 = "Latitude;Longitude (e.g. 51.5;12.9)" -note = "Note" - luci1 = "Here you can customize the settings and the functionality of FFLuCI." language = "Language" general = "General" diff --git a/module/admin-core/src/i18n/admin_uci.en b/modules/admin-core/src/i18n/admin_uci.en similarity index 100% rename from module/admin-core/src/i18n/admin_uci.en rename to modules/admin-core/src/i18n/admin_uci.en diff --git a/module/admin-core/src/model/cbi/admin_index/luci.lua b/modules/admin-core/src/model/cbi/admin_index/luci.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_index/luci.lua rename to modules/admin-core/src/model/cbi/admin_index/luci.lua diff --git a/module/admin-core/src/model/cbi/admin_network/dhcp.lua b/modules/admin-core/src/model/cbi/admin_network/dhcp.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_network/dhcp.lua rename to modules/admin-core/src/model/cbi/admin_network/dhcp.lua diff --git a/module/admin-core/src/model/cbi/admin_network/ifaces.lua b/modules/admin-core/src/model/cbi/admin_network/ifaces.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_network/ifaces.lua rename to modules/admin-core/src/model/cbi/admin_network/ifaces.lua diff --git a/module/admin-core/src/model/cbi/admin_network/ptp.lua b/modules/admin-core/src/model/cbi/admin_network/ptp.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_network/ptp.lua rename to modules/admin-core/src/model/cbi/admin_network/ptp.lua diff --git a/module/admin-core/src/model/cbi/admin_network/qos.lua b/modules/admin-core/src/model/cbi/admin_network/qos.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_network/qos.lua rename to modules/admin-core/src/model/cbi/admin_network/qos.lua diff --git a/module/admin-core/src/model/cbi/admin_network/routes.lua b/modules/admin-core/src/model/cbi/admin_network/routes.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_network/routes.lua rename to modules/admin-core/src/model/cbi/admin_network/routes.lua diff --git a/module/admin-core/src/model/cbi/admin_network/vlan.lua b/modules/admin-core/src/model/cbi/admin_network/vlan.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_network/vlan.lua rename to modules/admin-core/src/model/cbi/admin_network/vlan.lua diff --git a/module/admin-core/src/model/cbi/admin_services/dnsmasq.lua b/modules/admin-core/src/model/cbi/admin_services/dnsmasq.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_services/dnsmasq.lua rename to modules/admin-core/src/model/cbi/admin_services/dnsmasq.lua diff --git a/module/admin-core/src/model/cbi/admin_services/dropbear.lua b/modules/admin-core/src/model/cbi/admin_services/dropbear.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_services/dropbear.lua rename to modules/admin-core/src/model/cbi/admin_services/dropbear.lua diff --git a/module/admin-core/src/model/cbi/admin_services/httpd.lua b/modules/admin-core/src/model/cbi/admin_services/httpd.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_services/httpd.lua rename to modules/admin-core/src/model/cbi/admin_services/httpd.lua diff --git a/module/admin-core/src/model/cbi/admin_services/olsrd.lua b/modules/admin-core/src/model/cbi/admin_services/olsrd.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_services/olsrd.lua rename to modules/admin-core/src/model/cbi/admin_services/olsrd.lua diff --git a/module/admin-core/src/model/cbi/admin_system/fstab.lua b/modules/admin-core/src/model/cbi/admin_system/fstab.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_system/fstab.lua rename to modules/admin-core/src/model/cbi/admin_system/fstab.lua diff --git a/module/admin-core/src/model/cbi/admin_system/hostname.lua b/modules/admin-core/src/model/cbi/admin_system/hostname.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_system/hostname.lua rename to modules/admin-core/src/model/cbi/admin_system/hostname.lua diff --git a/module/admin-core/src/model/cbi/admin_wifi/devices.lua b/modules/admin-core/src/model/cbi/admin_wifi/devices.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_wifi/devices.lua rename to modules/admin-core/src/model/cbi/admin_wifi/devices.lua diff --git a/module/admin-core/src/model/cbi/admin_wifi/networks.lua b/modules/admin-core/src/model/cbi/admin_wifi/networks.lua similarity index 100% rename from module/admin-core/src/model/cbi/admin_wifi/networks.lua rename to modules/admin-core/src/model/cbi/admin_wifi/networks.lua diff --git a/module/admin-core/src/model/menu/00admin.lua b/modules/admin-core/src/model/menu/00admin.lua similarity index 76% rename from module/admin-core/src/model/menu/00admin.lua rename to modules/admin-core/src/model/menu/00admin.lua index 8f87792cad..c48db19bd6 100644 --- a/module/admin-core/src/model/menu/00admin.lua +++ b/modules/admin-core/src/model/menu/00admin.lua @@ -1,8 +1,5 @@ add("admin", "index", "Übersicht", 10) -act("wizard", "Freifunkassistent") -act("contact", "Kontakt") act("luci", "Oberfläche") -act("freifunk", "Freifunk") add("admin", "system", "System", 30) act("packages", "Paketverwaltung") @@ -20,9 +17,6 @@ end act("httpd", "HTTP-Server") act("dropbear", "SSH-Server") act("dnsmasq", "Dnsmasq") -if isfile("/etc/config/luci_splash") then - act("splash", "Client-Splash") -end add("admin", "network", "Netzwerk", 50) act("vlan", "Switch") @@ -30,8 +24,6 @@ act("ifaces", "Schnittstellen") act("dhcp", "DHCP-Server") act("ptp", "PPPoE / PPTP") act("routes", "Statische Routen") -act("portfw", "Portweiterleitung") -act("firewall", "Firewall") if isfile("/etc/config/qos") then act("qos", "Quality of Service") end diff --git a/module/admin-core/src/view/admin_index/index.htm b/modules/admin-core/src/view/admin_index/index.htm similarity index 100% rename from module/admin-core/src/view/admin_index/index.htm rename to modules/admin-core/src/view/admin_index/index.htm diff --git a/module/admin-core/src/view/admin_index/wizard.htm b/modules/admin-core/src/view/admin_index/wizard.htm similarity index 100% rename from module/admin-core/src/view/admin_index/wizard.htm rename to modules/admin-core/src/view/admin_index/wizard.htm diff --git a/module/admin-core/src/view/admin_network/index.htm b/modules/admin-core/src/view/admin_network/index.htm similarity index 100% rename from module/admin-core/src/view/admin_network/index.htm rename to modules/admin-core/src/view/admin_network/index.htm diff --git a/module/admin-core/src/view/admin_services/index.htm b/modules/admin-core/src/view/admin_services/index.htm similarity index 100% rename from module/admin-core/src/view/admin_services/index.htm rename to modules/admin-core/src/view/admin_services/index.htm diff --git a/module/admin-core/src/view/admin_system/editor.htm b/modules/admin-core/src/view/admin_system/editor.htm similarity index 100% rename from module/admin-core/src/view/admin_system/editor.htm rename to modules/admin-core/src/view/admin_system/editor.htm diff --git a/module/admin-core/src/view/admin_system/index.htm b/modules/admin-core/src/view/admin_system/index.htm similarity index 100% rename from module/admin-core/src/view/admin_system/index.htm rename to modules/admin-core/src/view/admin_system/index.htm diff --git a/module/admin-core/src/view/admin_system/ipkg.htm b/modules/admin-core/src/view/admin_system/ipkg.htm similarity index 100% rename from module/admin-core/src/view/admin_system/ipkg.htm rename to modules/admin-core/src/view/admin_system/ipkg.htm diff --git a/module/admin-core/src/view/admin_system/packages.htm b/modules/admin-core/src/view/admin_system/packages.htm similarity index 100% rename from module/admin-core/src/view/admin_system/packages.htm rename to modules/admin-core/src/view/admin_system/packages.htm diff --git a/module/admin-core/src/view/admin_system/passwd.htm b/modules/admin-core/src/view/admin_system/passwd.htm similarity index 100% rename from module/admin-core/src/view/admin_system/passwd.htm rename to modules/admin-core/src/view/admin_system/passwd.htm diff --git a/module/admin-core/src/view/admin_system/reboot.htm b/modules/admin-core/src/view/admin_system/reboot.htm similarity index 100% rename from module/admin-core/src/view/admin_system/reboot.htm rename to modules/admin-core/src/view/admin_system/reboot.htm diff --git a/module/admin-core/src/view/admin_system/sshkeys.htm b/modules/admin-core/src/view/admin_system/sshkeys.htm similarity index 100% rename from module/admin-core/src/view/admin_system/sshkeys.htm rename to modules/admin-core/src/view/admin_system/sshkeys.htm diff --git a/module/admin-core/src/view/admin_system/upgrade.htm b/modules/admin-core/src/view/admin_system/upgrade.htm similarity index 100% rename from module/admin-core/src/view/admin_system/upgrade.htm rename to modules/admin-core/src/view/admin_system/upgrade.htm diff --git a/module/admin-core/src/view/admin_uci/apply.htm b/modules/admin-core/src/view/admin_uci/apply.htm similarity index 100% rename from module/admin-core/src/view/admin_uci/apply.htm rename to modules/admin-core/src/view/admin_uci/apply.htm diff --git a/module/admin-core/src/view/admin_uci/changes.htm b/modules/admin-core/src/view/admin_uci/changes.htm similarity index 100% rename from module/admin-core/src/view/admin_uci/changes.htm rename to modules/admin-core/src/view/admin_uci/changes.htm diff --git a/module/admin-core/src/view/admin_uci/revert.htm b/modules/admin-core/src/view/admin_uci/revert.htm similarity index 100% rename from module/admin-core/src/view/admin_uci/revert.htm rename to modules/admin-core/src/view/admin_uci/revert.htm diff --git a/module/admin-core/src/view/admin_wifi/index.htm b/modules/admin-core/src/view/admin_wifi/index.htm similarity index 100% rename from module/admin-core/src/view/admin_wifi/index.htm rename to modules/admin-core/src/view/admin_wifi/index.htm diff --git a/themes/fledermaus/Makefile b/themes/fledermaus/Makefile new file mode 100644 index 0000000000..81a96f6a83 --- /dev/null +++ b/themes/fledermaus/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk \ No newline at end of file diff --git a/themes/fledermaus/contrib/media/cascade.css b/themes/fledermaus/root/www/ffluci/media/cascade.css similarity index 100% rename from themes/fledermaus/contrib/media/cascade.css rename to themes/fledermaus/root/www/ffluci/media/cascade.css diff --git a/themes/fledermaus/contrib/media/cbi.js b/themes/fledermaus/root/www/ffluci/media/cbi.js similarity index 100% rename from themes/fledermaus/contrib/media/cbi.js rename to themes/fledermaus/root/www/ffluci/media/cbi.js diff --git a/themes/fledermaus/contrib/media/logo.png b/themes/fledermaus/root/www/ffluci/media/logo.png similarity index 100% rename from themes/fledermaus/contrib/media/logo.png rename to themes/fledermaus/root/www/ffluci/media/logo.png -- 2.30.2