Kaynağa Gözat

Merge branch 'experimental' into testing

Karsten Böddeker 8 yıl önce
ebeveyn
işleme
a1bb5b9556

+ 6 - 0
i18n/de.po

@@ -31,6 +31,12 @@ msgstr ""
 "an <a href=\"mailto:kontakt@hochstift.freifunk.net\">kontakt@hochstift.freifunk.net</a> oder benutze am besten gleich das "
 "<a href=\"http://hochstift.freifunk.net/?page_id=366&key=<%=pubkey%>&nname=<%=hostname%>&mac=<%=sysconfig.primary_mac%>&email=<%=contact%>\"> "
 "vorausgefüllte Formular auf unserer Webseite</a>.<br><br>"
+"</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

+ 6 - 0
i18n/en.po

@@ -30,6 +30,12 @@ msgstr ""
 "<a href=\"http://hochstift.freifunk.net/?page_id=366&key=<%=pubkey%>&nname=<%=hostname%>&mac=<%=sysconfig.primary_mac%>&email=<%=contact%>\">this form</a> "
 "or send it together with your node's name (<em><%=hostname%></em>) to "
 "<a href=\"mailto:kontakt@hochstift.freifunk.net\">kontakt@hochstift.freifunk.net</a>."
+"</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

+ 2 - 2
modules

@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=http://git.c3pb.de/freifunk-pb/ffho-packages.git
-PACKAGES_FFHO_BRANCH=v2015.1.x
-PACKAGES_FFHO_COMMIT=8e7d0473a1107f04089d8d9c4e8be7173dfb9d2a
+PACKAGES_FFHO_BRANCH=v2016.1.x
+PACKAGES_FFHO_COMMIT=f6c5bbb7f4c9814b4b536181368eb66e47c28f08

+ 10 - 58
patches/0001-add-support-for-futro.patch

@@ -1,81 +1,33 @@
-From 7c749b9250367d6eb4c1d0b978cecc13c1a5e919 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Karsten=20B=C3=B6ddeker?= <freifunk@kb-light.de>
+From: Karten Böddeker <freifunk@kb-light.de>
 Date: Thu, 15 Oct 2015 16:35:06 +0200
 Subject: [PATCH] add support for futro
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Karsten Böddeker <freifunk@kb-light.de>
----
- patches/openwrt/1000-Add-support-for-futro.patch | 50 ++++++++++++++++++++++++
- targets/x86-generic/profiles.mk                  |  4 +-
- 2 files changed, 53 insertions(+), 1 deletion(-)
- create mode 100644 patches/openwrt/1000-Add-support-for-futro.patch
 
 diff --git a/patches/openwrt/1000-Add-support-for-futro.patch b/patches/openwrt/1000-Add-support-for-futro.patch
 new file mode 100644
 index 0000000..9efa901
 --- /dev/null
 +++ b/patches/openwrt/1000-Add-support-for-futro.patch
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,13 @@
 +From: Karsten Böddeker <freifunk@kb-light.de>
 +Date: Thu, 15 Oct 2015 14:40:53 +0200
 +Subject: Add support for futro
 +
-+diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
-+index 96c899a..0c531ca 100644
-+--- a/package/kernel/linux/modules/usb.mk
-++++ b/package/kernel/linux/modules/usb.mk
-+@@ -1439,3 +1439,32 @@ define KernelPackage/usb3/description
-+ endef
-+
-+ $(eval $(call KernelPackage,usb3))
-++
-++define KernelPackage/usb-net-rtl8150
-++  TITLE:=Kernel module for USB-to-Ethernet Realtek convertors
-++  KCONFIG:=CONFIG_USB_RTL8150
-++  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/rtl8150.ko
-++  AUTOLOAD:=$(call AutoProbe,rtl8150)
-++  $(call AddDepends/usb-net)
-++endef
-++
-++define KernelPackage/usb-net-rtl8150/description
-++ Kernel module for USB-to-Ethernet Realtek 8150 convertors
-++endef
-++
-++$(eval $(call KernelPackage,usb-net-rtl8150))
-++
-++
-++define KernelPackage/usb-net-rtl8152
-++  TITLE:=Kernel module for USB-to-Ethernet Realtek convertors
-++  KCONFIG:=CONFIG_USB_RTL8152
-++  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/r8152.ko
-++  AUTOLOAD:=$(call AutoProbe,r8152)
-++  $(call AddDepends/usb-net)
-++endef
-++
-++define KernelPackage/usb-net-rtl8152/description
-++ Kernel module for USB-to-Ethernet Realtek 8152 USB2.0/3.0 convertors
-++endef
-++
-++$(eval $(call KernelPackage,usb-net-rtl8152))
-+diff --git a/target/linux/x86/generic/config-3.10 b/target/linux/x86/generic/config-3.10
++diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
 +index 2babaab..12d1c7f 100644
-+--- a/target/linux/x86/generic/config-3.10
-++++ b/target/linux/x86/generic/config-3.10
-+@@ -201,3 +201,4 @@ CONFIG_VT_CONSOLE=y
++--- a/target/linux/x86/generic/config-default
+++++ b/target/linux/x86/generic/config-default
++@@ -198,3 +198,4 @@
++ # CONFIG_X86_LONGHAUL is not set
++ # CONFIG_X86_PCC_CPUFREQ is not set
 + CONFIG_X86_PM_TIMER=y
-+ # CONFIG_XO15_EBOOK is not set
-+ # CONFIG_ZISOFS is not set
 ++CONFIG_PATA_ATIIXP=y
 diff --git a/targets/x86-generic/profiles.mk b/targets/x86-generic/profiles.mk
 index b6551a7..a8a068d 100644
 --- a/targets/x86-generic/profiles.mk
 +++ b/targets/x86-generic/profiles.mk
 @@ -1,4 +1,6 @@
--X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity
-+X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity \
+-X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth
++X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth \
 +       kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-net kmod-usb-net-asix kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-usb-net-dm9601-ether
 +
 

+ 46 - 0
patches/0002-Add-Gluon-Support-for-Futro-to-Target-x86-64.patch

@@ -0,0 +1,46 @@
+From: Karsten=Böddeker <freifunk@kb-light.de>
+Date: Sat, 9 Jan 2016 01:39:31 +0100
+Subject: [PATCH 65/65] Add Gluon-Support for Futro to Target x86-64
+
+---
+ ...-Add-OpenWRT-Support-for-Futro-to-Target-x86-64.patch | 16 ++++++++++++++++
+ targets/x86-64/profiles.mk                               |  3 ++-
+ 2 files changed, 18 insertions(+), 1 deletion(-)
+ create mode 100644 patches/openwrt/1001-Add-OpenWRT-Support-for-Futro-to-Target-x86-64.patch
+
+diff --git a/patches/openwrt/1001-Add-OpenWRT-Support-for-Futro-to-Target-x86-64.patch b/patches/openwrt/1001-Add-OpenWRT-Support-for-Futro-to-Target-x86-64.patch
+new file mode 100644
+index 0000000..ee4e38a
+--- /dev/null
++++ b/patches/openwrt/1001-Add-OpenWRT-Support-for-Futro-to-Target-x86-64.patch
+@@ -0,0 +1,16 @@
++From: Karsten Böddeker <freifunk@kb-light.de>
++Date: Sat, 9 Jan 2016 01:30:21 +0100
++Subject: Add OpenWRT-Support for Futro to Target x86-64
++
++diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default
++index 1caad74..5bcadca 100644
++--- a/target/linux/x86/64/config-default
+++++ b/target/linux/x86/64/config-default
++@@ -131,6 +131,7 @@ CONFIG_PARAVIRT_CLOCK=y
++ # CONFIG_PARAVIRT_DEBUG is not set
++ # CONFIG_PARAVIRT_SPINLOCKS is not set
++ # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+++CONFIG_PATA_ATIIXP=y
++ CONFIG_PCIEAER=y
++ CONFIG_PCIEPORTBUS=y
++ # CONFIG_PCI_IOAPIC is not set
+diff --git a/targets/x86-64/profiles.mk b/targets/x86-64/profiles.mk
+index 8f561fc..666daee 100644
+--- a/targets/x86-64/profiles.mk
++++ b/targets/x86-64/profiles.mk
+@@ -1,4 +1,5 @@
+-X86_64_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth
++X86_64_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth \
++	kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-net kmod-usb-net-asix kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-usb-net-dm9601-ether
+ 
+ 
+ $(eval $(call GluonProfile,GENERIC,$(X86_64_NETWORK_MODULES)))
+-- 
+2.1.4
+

+ 0 - 79
patches/0002-lua-cjson-add-host-build-support.patch

@@ -1,79 +0,0 @@
-From a0a9446ad55d2dbc4ed148930e1f39ed8e4b13f4 Mon Sep 17 00:00:00 2001
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 30 Dec 2015 01:02:59 +0100
-Subject: [PATCH] lua-cjson: add host build support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Karsten Böddeker <freifunk@kb-light.de>
----
- ...ix-installation-of-headers-for-host-build.patch | 16 +++++++++++
- .../0004-lua-cjson-add-host-build-support.patch    | 32 ++++++++++++++++++++++
- 2 files changed, 48 insertions(+)
- create mode 100644 patches/openwrt/1001-lua-fix-installation-of-headers-for-host-build.patch
- create mode 100644 patches/packages/openwrt/1000-lua-cjson-add-host-build-support.patch
-
-diff --git a/patches/openwrt/1001-lua-fix-installation-of-headers-for-host-build.patch b/patches/openwrt/1001-lua-fix-installation-of-headers-for-host-build.patch
-new file mode 100644
-index 0000000..ab49ad6
---- /dev/null
-+++ b/patches/openwrt/1001-lua-fix-installation-of-headers-for-host-build.patch
-@@ -0,0 +1,16 @@
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Tue, 29 Dec 2015 22:48:52 +0100
-+Subject: lua: fix installation of headers for host build
-+
-+diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
-+index 72d5631..c37d99b 100644
-+--- a/package/utils/lua/Makefile
-++++ b/package/utils/lua/Makefile
-+@@ -140,6 +140,7 @@ define Host/Install
-+ 	$(MAKE) -C $(HOST_BUILD_DIR) \
-+ 		INSTALL_TOP="$(STAGING_DIR_HOST)" \
-+ 		install
-++	$(CP) $(HOST_BUILD_DIR)/src/lnum_config.h $(STAGING_DIR_HOST)/include/
-+ endef
-+ 
-+ define Build/InstallDev
-diff --git a/patches/packages/openwrt/1000-lua-cjson-add-host-build-support.patch b/patches/packages/openwrt/10001-lua-cjson-add-host-build-support.patch
-new file mode 100644
-index 0000000..9c1f774
---- /dev/null
-+++ b/patches/packages/openwrt/1000-lua-cjson-add-host-build-support.patch
-@@ -0,0 +1,32 @@
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Wed, 30 Dec 2015 01:00:49 +0100
-+Subject: lua-cjson: add host build support
-+
-+diff --git a/lang/lua-cjson/Makefile b/lang/lua-cjson/Makefile
-+index fd489f2..90c8f98 100644
-+--- a/lang/lua-cjson/Makefile
-++++ b/lang/lua-cjson/Makefile
-+@@ -20,6 +20,7 @@ PKG_MD5SUM:=24f270663e9f6ca8ba2a02cef19f7963
-+ 
-+ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-+ 
-++include $(INCLUDE_DIR)/host-build.mk
-+ include $(INCLUDE_DIR)/package.mk
-+ include $(INCLUDE_DIR)/cmake.mk
-+ 
-+@@ -39,6 +40,9 @@ endef
-+ CMAKE_OPTIONS += \
-+ 	-DUSE_LUA=ON
-+ 
-++CMAKE_HOST_OPTIONS += \
-++	-DLUA_MATH_LIBRARY=m
-++
-+ define Package/lua-cjson/install
-+ 	$(INSTALL_DIR) $(1)/usr/lib/lua
-+ 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cjson.so $(1)/usr/lib/lua/
-+@@ -47,4 +51,5 @@ define Package/lua-cjson/install
-+ 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/lua/cjson/util.lua $(1)/usr/lib/lua/cjson
-+ endef
-+ 
-++$(eval $(call HostBuild))
-+ $(eval $(call BuildPackage,lua-cjson))
--- 
-2.1.4
-

+ 22 - 0
patches/0003-Add-Gluon-Support-for-apu2-to-Target-x86-64.patch

@@ -0,0 +1,22 @@
+From: Karsten Böddeker <freifunk@kb-light.de>
+Date: Sat, 27 Feb 2016 01:29:42 +0100
+Subject: [PATCH] Add Gluon-Support for pc-engines apu2 to Target x86-64
+
+---
+ targets/x86-64/profiles.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/targets/x86-64/profiles.mk b/targets/x86-64/profiles.mk
+index 666daee..8deceef 100644
+--- a/targets/x86-64/profiles.mk
++++ b/targets/x86-64/profiles.mk
+@@ -1,5 +1,5 @@
+ X86_64_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth \
+-	kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-net kmod-usb-net-asix kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-usb-net-dm9601-ether
++	kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-net kmod-usb-net-asix kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-usb-net-dm9601-ether kmod-igb
+ 
+ 
+ $(eval $(call GluonProfile,GENERIC,$(X86_64_NETWORK_MODULES)))
+-- 
+2.1.4
+

+ 43 - 35
site.conf

@@ -17,10 +17,7 @@
 	prefix6 = 'fdca:ffee:ff12:132::/64',
 
 	-- extra ipv6 prefixes used in this mesh area
-	additional_prefix6 = {
-		'2001:470:6d:860::/64',
-		'2a03:2260:2342:2300::/64',
-	},
+	additional_prefix6 = { '2001:470:6d:860::/64', '2a03:2260:2342:2300::/64', },
 
 	-- timezone
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
@@ -29,30 +26,45 @@
 	ntp_servers = {'ntp.in.ffho.net'},
 
 	-- OpenWRT Package Repository (IPv6 capable)
-	opkg_repo = 'http://openwrt.draic.info/%n/%v/%S/packages',
+	opkg = {
+		openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+		extra = {
+			modules = 'http://firmware.ffho.net/modules/gluon-ffho-%GR/%S',
+		},
+	},
 
 	-- regulatory domain of your wifi
-	regdom = 'DE',
+	regdom = '00',
 
 	-- wifi settings (2.4 GHz and 5 GHz)
-	-- ssid = 'hochstift.freifunk.net/${kürzel}',
-	-- mesh_ssid = 'ffho-mesh-${un-code}',
-	-- mesh_bssid = '${idividual-mac}'
+	-- ap.ssid = 'hochstift.freifunk.net/${kürzel}',
+	-- ibss.ssid = 'ffho-mesh-${un-code}',
+	-- ibss.bssid = '${idividual-mac}'
 	wifi24 = {
-		ssid = 'paderborn.freifunk.net',
 		channel = 1,
-		htmode = 'HT20',
-		mesh_ssid = '02:d1:11:13:87:ad',
-		mesh_bssid = '02:d1:11:13:87:ad',
-		mesh_mcast_rate = 12000,
+
+		ap = {
+			ssid = 'paderborn.freifunk.net',
+		},
+
+		ibss = {
+			ssid = '02:d1:11:13:87:ad',
+			bssid = '02:d1:11:13:87:ad',
+			mesh_mcast_rate = 12000,
+		},
 	},
 	wifi5 = {
-		ssid = 'paderborn.freifunk.net',
 		channel = 44,
-		htmode = 'HT40+',
-		mesh_ssid = '02:d1:11:13:87:ad',
-		mesh_bssid = '02:d1:11:13:87:ad',
-		mesh_mcast_rate = 12000,
+
+		ap = {
+			ssid = 'paderborn.freifunk.net',
+		},
+
+		ibss = {
+			ssid = '02:d1:11:13:87:ad',
+			bssid = '02:d1:11:13:87:ad',
+			mesh_mcast_rate = 12000,
+		},
 	},
 
 	-- IP address of each router
@@ -146,6 +158,15 @@
 				},
 			},
 		},
+
+		-- default traffic shaping (bandwidth limit) settings
+		bandwidth_limit = {
+			enabled = false,
+			egress = 200,
+			ingress = 3000,
+		},
+
+
 	},
 
 	-- configure the autoupdater
@@ -165,7 +186,7 @@
 				-- where to get the manifest file (without the trailing /manifest)
 				-- It's wise to use an internal address here,
 				-- but specifying a publicly available update site does not hurt.
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/stable', 'http://firmware.paderborn.freifunk.net/stable'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/stable', 'http://firmware.ffho.net/%GS/stable'},
 
 				-- Number of valid manifest signatures necessary to accept the manifest as "good".
 				good_signatures = 3,
@@ -173,7 +194,6 @@
 				-- list of public keys which are considered "good" for manifest signatures
 				pubkeys = {
 					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
@@ -182,11 +202,10 @@
 			},
 			testing = {
 				name = 'testing',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/testing','http://firmware.paderborn.freifunk.net/testing'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/testing','http://firmware.ffho.net/%GS/testing'},
 				good_signatures = 2,
 				pubkeys = {
 					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
@@ -195,11 +214,10 @@
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/experimental','http://firmware.paderborn.freifunk.net/experimental'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/experimental','http://firmware.ffho.net/%GS/experimental'},
 				good_signatures = 1,
 				pubkeys = {
 					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
@@ -209,16 +227,6 @@
 		},
 	},
 
-	-- default traffic shaping (bandwidth limit) settings
-	simple_tc = {
-		mesh_vpn = {
-			ifname = 'mesh-vpn',
-			enabled = false,
-			limit_egress = 200,
-			limit_ingress = 3000,
-		},
-	},
-
 	-- configure ffho-debug
 	debugserver = {
 		host = { 'debugreport.ffho.net', 'fdca:ffee:ff12:a254::deb9' },

+ 5 - 4
site.mk

@@ -4,12 +4,13 @@ GLUON_SITE_PACKAGES := \
 	ffho-debug \
 	ffho-node-tuning \
 	ffho-ebtables-net-rules \
-	ffho-openwrt-migration-tools \
 	ffho-alfred-config \
+	ffho-txpower-fix \
 	ffho-site-auto-select \
 	gluon-alfred \
-	gluon-announced \
-	gluon-autoupdater \
+	gluon-respondd \
+	ffho-autoupdater \
+	ffho-autoupdater-wifi-fallback \
 	gluon-config-mode-core \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-hostname \
@@ -34,7 +35,7 @@ GLUON_SITE_PACKAGES := \
 
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 0.6.5~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.7.1~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)