Merge branch 'master' into gluon-next

2018-06-27 15:36:30 +02:00 · 2018-06-27 15:36:30 +02:00 · f4d8f78a6c
parent 841a2cdff5 d4d63d7aef
commit f4d8f78a6c
3 changed files with 2 additions and 13 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 55706d391d56f13931b571c8f9eac452c8d0ebdc
+Subproject commit e968a225be0efafbd2d4638d0bd530e2d4e841f3
--- a/3
+++ b/3
@ -1,5 +1,4 @@
 GLUON_SITE_FEEDS='ffhb'

 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
-PACKAGES_FFHB_BRANCH=v2017.1
-PACKAGES_FFHB_COMMIT=ee75f9971712b1595e2f397963c0bdfb03114a1c
+PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a
--- a/site.conf
+++ b/site.conf
@ -62,16 +62,6 @@
 		ip6 = 'fd2f:5119:0f2c::127',
 		mac = '16:41:95:40:f7:dc',
 	},
-	dns = {
-		cacheentries = 500,
-		servers = {
-			'fd2f:5119:0f2c::1',
-			'fd2f:5119:0f2c::2',
-			'fd2f:5119:0f2c::3',
-			'fd2f:5119:0f2c::5',
-			'fd2f:5119:0f2c::6',
-		},
-	},

 	mesh_vpn = {
 		enabled = true,