From 1fc62943f867b67881a04c4acf3b4ff3f5961ec4 Mon Sep 17 00:00:00 2001 From: Bastian Date: Mon, 16 May 2016 13:54:20 +0200 Subject: [PATCH 01/12] Site Select added.. --- extra/ffrgb.conf | 119 ++++++++++++++++++++++++++++++++++++++++ extra/ffrgb_umland.conf | 119 ++++++++++++++++++++++++++++++++++++++++ site.conf | 2 +- 3 files changed, 239 insertions(+), 1 deletion(-) create mode 100644 extra/ffrgb.conf create mode 100644 extra/ffrgb_umland.conf diff --git a/extra/ffrgb.conf b/extra/ffrgb.conf new file mode 100644 index 0000000..7127f39 --- /dev/null +++ b/extra/ffrgb.conf @@ -0,0 +1,119 @@ +{ + hostname_prefix = '', + site_name = 'Freifunk Regensburg', + site_code = 'ffrgb-bat15', + + opkg = { + openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages', + }, + + prefix4 = '10.90.0.0/19', + prefix6 = 'fdef:f00f:1337:cafe/64', + + timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', + ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'}, + + mesh_on_wan = true, + + regdom = 'DE', + + wifi24 = { + channel = 1, + ap = { + ssid = 'regensburg.freifunk.net', + }, + ibss = { + ssid = 'mesh.ffrgb', + bssid = '02:0E:8E:1E:61:17', + mcast_rate = 12000, + }, + }, + + wifi5 = { + channel = 44, + ap = { + ssid = 'regensburg.freifunk.net', + }, + ibss = { + ssid = 'mesh.ffrgb', + bssid = '02:0E:8E:1E:61:17', + mcast_rate = 12000, + } + }, + + next_node = { + ip4 = '10.90.0.1', + ip6 = 'fdef:f00f:1337:cafe::1', + mac = '16:41:95:40:f7:dd', + }, + + + fastd_mesh_vpn = { + bandwidth_limit = { + enabled = false, + ingress = 12000, + egress = 1200, + }, + methods = {'salsa2012+umac'}, + mtu = 1426, + groups = { + backbone = { + limit = 2, + peers = { + gw01 = { --[[ sven ]] + key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66', + remotes = { + 'ipv4 "78.47.168.108" port 10000', + }, + }, + gw02 = { --[[ alamar ]] + key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214', + remotes = { + 'ipv4 "185.53.218.23" port 10000', + }, + }, + gw04 = { --[[ mephisto ]] + key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5', + remotes = { + 'ipv4 "213.166.225.5" port 10000', + }, + }, + }, + }, + }, + }, + + autoupdater = { + enabled = 1, + branch = 'stable', + branches = { + stable = { + name = 'stable', + mirrors = { + 'http://[fdef:f00f:1337:cafe::11]/firmware/stable/sysupgrade/', + }, + probability = 0.1, + good_signatures = 1, + pubkeys = { + '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto + '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven + 'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver + }, + }, + experimental = { + name = 'experimental', + mirrors = { + 'http://[fdef:f00f:1337:cafe::11]/firmware/experimental/sysupgrade/', + }, + probability = 0.5, + good_signatures = 1, + pubkeys = { + '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto + '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven + 'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver + }, + }, + }, + }, +} +-- vim: set ft=lua:ts=2:sw=2:et diff --git a/extra/ffrgb_umland.conf b/extra/ffrgb_umland.conf new file mode 100644 index 0000000..692425d --- /dev/null +++ b/extra/ffrgb_umland.conf @@ -0,0 +1,119 @@ +{ + hostname_prefix = '', + site_name = 'Freifunk Regensburg', + site_code = 'ffrgb-bat15', + + opkg = { + openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages', + }, + + prefix4 = '10.90.32.0/19', + prefix6 = 'fdef:f00f:1337:caff/64', + + timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', + ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'}, + + mesh_on_wan = true, + + regdom = 'DE', + + wifi24 = { + channel = 1, + ap = { + ssid = 'regensburg.freifunk.net', + }, + ibss = { + ssid = 'mesh.ffrgb.umland', + bssid = '02:0E:8E:1E:61:18', + mcast_rate = 12000, + }, + }, + + wifi5 = { + channel = 44, + ap = { + ssid = 'regensburg.freifunk.net', + }, + ibss = { + ssid = 'mesh.ffrgb.umland', + bssid = '02:0E:8E:1E:61:18', + mcast_rate = 12000, + } + }, + + next_node = { + ip4 = '10.90.32.1', + ip6 = 'fdef:f00f:1337:caff::1', + mac = '16:41:95:40:f7:dd', + }, + + + fastd_mesh_vpn = { + bandwidth_limit = { + enabled = false, + ingress = 12000, + egress = 1200, + }, + methods = {'salsa2012+umac'}, + mtu = 1426, + groups = { + backbone = { + limit = 2, + peers = { + gw01 = { --[[ sven ]] + key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66', + remotes = { + 'ipv4 "78.47.168.108" port 10010', + }, + }, + gw02 = { --[[ alamar ]] + key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214', + remotes = { + 'ipv4 "185.53.218.23" port 10010', + }, + }, + gw04 = { --[[ mephisto ]] + key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5', + remotes = { + 'ipv4 "213.166.225.5" port 10010', + }, + }, + }, + }, + }, + }, + + autoupdater = { + enabled = 1, + branch = 'stable', + branches = { + stable = { + name = 'stable', + mirrors = { + 'http://[fdef:f00f:1337:cafe::11]/firmware/stable/sysupgrade/', + }, + probability = 0.1, + good_signatures = 1, + pubkeys = { + '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto + '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven + 'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver + }, + }, + experimental = { + name = 'experimental', + mirrors = { + 'http://[fdef:f00f:1337:cafe::11]/firmware/experimental/sysupgrade/', + }, + probability = 0.5, + good_signatures = 1, + pubkeys = { + '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto + '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven + 'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver + }, + }, + }, + }, +} +-- vim: set ft=lua:ts=2:sw=2:et diff --git a/site.conf b/site.conf index bd5443f..7127f39 100644 --- a/site.conf +++ b/site.conf @@ -7,7 +7,7 @@ openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages', }, - prefix4 = '10.90.0.0/16', + prefix4 = '10.90.0.0/19', prefix6 = 'fdef:f00f:1337:cafe/64', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', From cc5d2095d62b9c660a36567b797c6476c475e74d Mon Sep 17 00:00:00 2001 From: Bastian Date: Mon, 16 May 2016 13:59:31 +0200 Subject: [PATCH 02/12] site_name and code adjusted.. --- extra/ffrgb_umland.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/ffrgb_umland.conf b/extra/ffrgb_umland.conf index 692425d..489905a 100644 --- a/extra/ffrgb_umland.conf +++ b/extra/ffrgb_umland.conf @@ -1,7 +1,7 @@ { hostname_prefix = '', - site_name = 'Freifunk Regensburg', - site_code = 'ffrgb-bat15', + site_name = 'Freifunk Regensburg Umland', + site_code = 'ffrgb-bat15-umland', opkg = { openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages', From f043301d87a7fc6e56a8a0282ce6a77ce23cb7da Mon Sep 17 00:00:00 2001 From: Bastian Date: Mon, 16 May 2016 14:19:27 +0200 Subject: [PATCH 03/12] minor fixes... --- extra/{ffrgb.conf => ffrgb-bat15.conf} | 0 extra/{ffrgb_umland.conf => ffrgb-bat15_umland.conf} | 2 +- modules | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename extra/{ffrgb.conf => ffrgb-bat15.conf} (100%) rename extra/{ffrgb_umland.conf => ffrgb-bat15_umland.conf} (98%) diff --git a/extra/ffrgb.conf b/extra/ffrgb-bat15.conf similarity index 100% rename from extra/ffrgb.conf rename to extra/ffrgb-bat15.conf diff --git a/extra/ffrgb_umland.conf b/extra/ffrgb-bat15_umland.conf similarity index 98% rename from extra/ffrgb_umland.conf rename to extra/ffrgb-bat15_umland.conf index 489905a..53ce21b 100644 --- a/extra/ffrgb_umland.conf +++ b/extra/ffrgb-bat15_umland.conf @@ -1,7 +1,7 @@ { hostname_prefix = '', site_name = 'Freifunk Regensburg Umland', - site_code = 'ffrgb-bat15-umland', + site_code = 'ffrgb-bat15_umland', opkg = { openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages', diff --git a/modules b/modules index 52099cb..d30af9a 100644 --- a/modules +++ b/modules @@ -1,3 +1,3 @@ -GLUON_SITE_FEEDS='ffmuc_packages' -PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/ffrgb/gluon-packages.git -PACKAGES_FFMUC_PACKAGES_COMMIT=3441ee26433d2bd35a27440add6d6b686c1f4b38 +GLUON_SITE_FEEDS='ffrgb_packages' +PACKAGES_FFRGB_PACKAGES_REPO=https://github.com/ffrgb/gluon-packages.git +PACKAGES_FFRGB_PACKAGES_COMMIT=3441ee26433d2bd35a27440add6d6b686c1f4b38 From cc3163eed53cd1a5598a203e906f50380feea3f9 Mon Sep 17 00:00:00 2001 From: Bastian Date: Mon, 16 May 2016 14:35:04 +0200 Subject: [PATCH 04/12] documentation, siteselector was missing to site.mk --- CHANGELOG.md | 9 +++++++++ site.mk | 1 + 2 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a2e3fe..893e4b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Freifunk Regensburg Firmware Changelog +## v2016.2 + - Site Selector integrated (Segment 'Freifunk Regensburg' and 'Freifunk Regensburg Umland') + +## v2016.1 + - Update to Gluon v2015.1.4 + - Many new devices + - switched from announced to respondd + - changed naming: no more sitecode in version, Schwandorf dropped + ## v2015.1-ffrgb - Update to Gluon v2015.1 - Integrated no_rebroadcast fix on mesh-vpn from Gluon Upstream diff --git a/site.mk b/site.mk index c3ee2b5..0c902af 100644 --- a/site.mk +++ b/site.mk @@ -9,6 +9,7 @@ GLUON_SITE_PACKAGES := \ gluon-config-mode-mesh-vpn \ gluon-config-mode-geo-location \ gluon-config-mode-contact-info \ + gluon-config-mode-site-select \ gluon-ebtables-filter-multicast \ gluon-ebtables-filter-ra-dhcp \ gluon-luci-admin \ From 7329a04e4b5de8dceb60a3f99a43c0cb6a31119a Mon Sep 17 00:00:00 2001 From: Bastian Date: Mon, 16 May 2016 16:33:30 +0200 Subject: [PATCH 05/12] site feed changed.. --- modules | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules b/modules index d30af9a..dbb7115 100644 --- a/modules +++ b/modules @@ -1,3 +1,4 @@ -GLUON_SITE_FEEDS='ffrgb_packages' -PACKAGES_FFRGB_PACKAGES_REPO=https://github.com/ffrgb/gluon-packages.git -PACKAGES_FFRGB_PACKAGES_COMMIT=3441ee26433d2bd35a27440add6d6b686c1f4b38 +GLUON_SITE_FEEDS='ffrgb' +PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git +PACKAGES_FFRGB_BRANCH=master +PACKAGES_FFRGB_COMMIT=3441ee26433d2bd35a27440add6d6b686c1f4b38 From 108800220cbf5925d9b3e9491b46994ca1c03bf9 Mon Sep 17 00:00:00 2001 From: Bastian Date: Mon, 16 May 2016 17:43:30 +0200 Subject: [PATCH 06/12] ffrgb package feed commit id changed (again)... --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index dbb7115..516dbe2 100644 --- a/modules +++ b/modules @@ -1,4 +1,4 @@ GLUON_SITE_FEEDS='ffrgb' PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git PACKAGES_FFRGB_BRANCH=master -PACKAGES_FFRGB_COMMIT=3441ee26433d2bd35a27440add6d6b686c1f4b38 +PACKAGES_FFRGB_COMMIT=c7624cc330200b11d3330da5e0dfe503e47e0d3f From 959bac781437d7b19b2d8e7522dd51b7fac0fcae Mon Sep 17 00:00:00 2001 From: Bastian Date: Mon, 16 May 2016 19:31:47 +0200 Subject: [PATCH 07/12] removed dashes from sitecode, may interfere with site-select --- extra/{ffrgb-bat15.conf => ffrgb.conf} | 2 +- extra/{ffrgb-bat15_umland.conf => ffrgb_umland.conf} | 2 +- site.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename extra/{ffrgb-bat15.conf => ffrgb.conf} (99%) rename extra/{ffrgb-bat15_umland.conf => ffrgb_umland.conf} (98%) diff --git a/extra/ffrgb-bat15.conf b/extra/ffrgb.conf similarity index 99% rename from extra/ffrgb-bat15.conf rename to extra/ffrgb.conf index 7127f39..87ca94f 100644 --- a/extra/ffrgb-bat15.conf +++ b/extra/ffrgb.conf @@ -1,7 +1,7 @@ { hostname_prefix = '', site_name = 'Freifunk Regensburg', - site_code = 'ffrgb-bat15', + site_code = 'ffrgb', opkg = { openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages', diff --git a/extra/ffrgb-bat15_umland.conf b/extra/ffrgb_umland.conf similarity index 98% rename from extra/ffrgb-bat15_umland.conf rename to extra/ffrgb_umland.conf index 53ce21b..01ee888 100644 --- a/extra/ffrgb-bat15_umland.conf +++ b/extra/ffrgb_umland.conf @@ -1,7 +1,7 @@ { hostname_prefix = '', site_name = 'Freifunk Regensburg Umland', - site_code = 'ffrgb-bat15_umland', + site_code = 'ffrgb_umland', opkg = { openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages', diff --git a/site.conf b/site.conf index 7127f39..87ca94f 100644 --- a/site.conf +++ b/site.conf @@ -1,7 +1,7 @@ { hostname_prefix = '', site_name = 'Freifunk Regensburg', - site_code = 'ffrgb-bat15', + site_code = 'ffrgb', opkg = { openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages', From 9453fcac49f134408e1cb9c4ce7b20be1e34707a Mon Sep 17 00:00:00 2001 From: Bastian Date: Fri, 27 May 2016 20:14:19 +0200 Subject: [PATCH 08/12] packages commit id adjusted.. --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 516dbe2..78c7cb1 100644 --- a/modules +++ b/modules @@ -1,4 +1,4 @@ GLUON_SITE_FEEDS='ffrgb' PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git PACKAGES_FFRGB_BRANCH=master -PACKAGES_FFRGB_COMMIT=c7624cc330200b11d3330da5e0dfe503e47e0d3f +PACKAGES_FFRGB_COMMIT=c7968bfedb86ee8d7b5e80405095bcb199ef508c From 1a687d8d29bda32a23f2cef44c3e2e46609bf2a4 Mon Sep 17 00:00:00 2001 From: Bastian Date: Sat, 28 May 2016 20:51:49 +0200 Subject: [PATCH 09/12] changed site-select extensions to .json --- Makefile | 4 ++-- extra/{ffrgb.conf => ffrgb.json} | 0 extra/{ffrgb_umland.conf => ffrgb_umland.json} | 0 modules | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename extra/{ffrgb.conf => ffrgb.json} (100%) rename extra/{ffrgb_umland.conf => ffrgb_umland.json} (100%) diff --git a/Makefile b/Makefile index 9455882..9fbad94 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := 80d5f5f995f131ce1444587318e544bfca337b0d +GLUON_GIT_REF := 6899e50c97b34976fcb7d627062e6effa8078067 #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43 @@ -22,7 +22,7 @@ endif JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) -#JOBS = 1 +JOBS = 1 GLUON_MAKE := ${MAKE} V=s -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_RELEASE=${GLUON_RELEASE} \ diff --git a/extra/ffrgb.conf b/extra/ffrgb.json similarity index 100% rename from extra/ffrgb.conf rename to extra/ffrgb.json diff --git a/extra/ffrgb_umland.conf b/extra/ffrgb_umland.json similarity index 100% rename from extra/ffrgb_umland.conf rename to extra/ffrgb_umland.json diff --git a/modules b/modules index 78c7cb1..586d625 100644 --- a/modules +++ b/modules @@ -1,4 +1,4 @@ GLUON_SITE_FEEDS='ffrgb' PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git PACKAGES_FFRGB_BRANCH=master -PACKAGES_FFRGB_COMMIT=c7968bfedb86ee8d7b5e80405095bcb199ef508c +PACKAGES_FFRGB_COMMIT=68f1139ad72ce1a50320eee02aa6797967b9c214 From 8bbac800b2eb152d90653d6c7dfa2bd8c5fdec2e Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 29 May 2016 18:45:33 +0200 Subject: [PATCH 10/12] temporarily removed site-select to get build of gluon-2016.1.5 --- extra/{ffrgb.json => ffrgb.conf} | 0 extra/{ffrgb_umland.json => ffrgb_umland.conf} | 0 site.mk | 3 +-- 3 files changed, 1 insertion(+), 2 deletions(-) rename extra/{ffrgb.json => ffrgb.conf} (100%) rename extra/{ffrgb_umland.json => ffrgb_umland.conf} (100%) diff --git a/extra/ffrgb.json b/extra/ffrgb.conf similarity index 100% rename from extra/ffrgb.json rename to extra/ffrgb.conf diff --git a/extra/ffrgb_umland.json b/extra/ffrgb_umland.conf similarity index 100% rename from extra/ffrgb_umland.json rename to extra/ffrgb_umland.conf diff --git a/site.mk b/site.mk index 0c902af..b305bb1 100644 --- a/site.mk +++ b/site.mk @@ -9,7 +9,6 @@ GLUON_SITE_PACKAGES := \ gluon-config-mode-mesh-vpn \ gluon-config-mode-geo-location \ gluon-config-mode-contact-info \ - gluon-config-mode-site-select \ gluon-ebtables-filter-multicast \ gluon-ebtables-filter-ra-dhcp \ gluon-luci-admin \ @@ -27,7 +26,7 @@ GLUON_SITE_PACKAGES := \ haveged \ gluon-ebtables-filter-arp-ffmuc \ gluon-ebtables-filter-multicast-ffmuc - +# gluon-config-mode-site-select # basic support for USB stack USB_PACKAGES_BASIC := \ From 1d883c8112278b975d24a2b899d08f719b3ac853 Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 29 May 2016 18:47:20 +0200 Subject: [PATCH 11/12] multithread.. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9fbad94..68e97a0 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ endif JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) -JOBS = 1 +#JOBS = 1 GLUON_MAKE := ${MAKE} V=s -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_RELEASE=${GLUON_RELEASE} \ From 98a129f2fbe5941f72e9206c0542396ef120cb59 Mon Sep 17 00:00:00 2001 From: Bastian Date: Tue, 31 May 2016 19:26:57 +0200 Subject: [PATCH 12/12] Changelog... --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 893e4b3..f7db584 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Freifunk Regensburg Firmware Changelog -## v2016.2 - - Site Selector integrated (Segment 'Freifunk Regensburg' and 'Freifunk Regensburg Umland') +## v2016.1-12 experimental + - Update to Gluon 2016.1.5 ## v2016.1 - Update to Gluon v2015.1.4