From 591ed245d07facc7fac0e6a06ed991f640b685f9 Mon Sep 17 00:00:00 2001
From: Jan-Philipp Litza <janphilipp@litza.de>
Date: Fri, 1 May 2015 09:50:14 +0200
Subject: [PATCH] Update site.conf and site.mk for compatibility with latest
 nightlies

---
 site.conf | 30 ++++++++++++++++--------------
 site.mk   |  2 ++
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/site.conf b/site.conf
index 1703084..f187469 100644
--- a/site.conf
+++ b/site.conf
@@ -39,20 +39,22 @@
 	fastd_mesh_vpn = {
 		methods = {'salsa2012+gmac'},
 		mtu = 1426,
-		backbone = {
-			limit = 2,
-			peers = {
-				vpn01 = {
-					key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f',
-					remotes = {'ipv4 "vpn01.bremen.freifunk.net" port 10000'},
-				},
-				vpn02 = {
-					key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c',
-					remotes = {'ipv4 "vpn02.bremen.freifunk.net" port 10000'},
-				},
-				vpn03 = {
-					key = '6c16136b58da06e3cc83bc92ef09bb19b7dfa787e390929a0ac0d4bbebddee2b',
-					remotes = {'ipv4 "vpn03.bremen.freifunk.net" port 10000'},
+		groups = {
+			backbone = {
+				limit = 2,
+				peers = {
+					vpn01 = {
+						key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f',
+						remotes = {'ipv4 "vpn01.bremen.freifunk.net" port 10000'},
+					},
+					vpn02 = {
+						key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c',
+						remotes = {'ipv4 "vpn02.bremen.freifunk.net" port 10000'},
+					},
+					vpn03 = {
+						key = '6c16136b58da06e3cc83bc92ef09bb19b7dfa787e390929a0ac0d4bbebddee2b',
+						remotes = {'ipv4 "vpn03.bremen.freifunk.net" port 10000'},
+					},
 				},
 			},
 		},
diff --git a/site.mk b/site.mk
index 9abb763..d4fd39b 100644
--- a/site.mk
+++ b/site.mk
@@ -3,6 +3,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-alfred \
 	gluon-announced \
 	gluon-autoupdater \
+	gluon-config-mode-core \
 	gluon-config-mode-hostname \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-mesh-vpn \
@@ -14,6 +15,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-luci-private-wifi \
 	gluon-mesh-vpn-fastd \
 	gluon-next-node \
+	gluon-setup-mode \
 	gluon-speedtest \
 	gluon-status-page \
 	gluon-wan-dnsmasq-static \