From 2b33614c874c51d8c0b24971e5764b5b6eeb66db Mon Sep 17 00:00:00 2001
From: Bastian <mephisto@mephis.to>
Date: Wed, 10 Jan 2018 23:14:55 +0100
Subject: [PATCH] various fixed to site-select

---
 Makefile            |  4 ++--
 extra/template.conf | 28 ++++------------------------
 site.mk             |  3 ++-
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 119f951..9004580 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ GLUON_GIT_REF := v2016.2.6
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
 GLUON_TARGETS ?= \
-	ar71xx-generic \
-	ar71xx-nand #\
+	ar71xx-generic #\
+#	ar71xx-nand #\
 #	brcm2708-bcm2708 \
 #	brcm2708-bcm2709 \
 #	mpc85xx-generic \
diff --git a/extra/template.conf b/extra/template.conf
index 44a3fe6..668bfc7 100644
--- a/extra/template.conf
+++ b/extra/template.conf
@@ -55,44 +55,24 @@
       egress = 1200,
     },
     methods = {'salsa2012+umac'},
-    mtu = %MT,
+    mtu = '%MT',
     groups = {
       backbone = {
-      limit = 1,
+        limit = 1,
         peers = {
-          gw01-1 = {   --[[ pri gw instance 1 ]]
+          gwpri = {   --[[ pri gw instance 1 ]]
             key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
             remotes = {
               'ipv4 "%PRI" port 10%ID0',
-            },
-          },
-          gw01-2 = {   --[[ pri gw instance 2 ]]
-            key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
-            remotes = {
               'ipv4 "%PRI" port 10%ID1',
-            },
-          },
-          gw01-3 = {   --[[ pri gw instance 3 ]]
-            key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
-            remotes = {
               'ipv4 "%PRI" port 10%ID2',
             },
           },
-          gw02-1 = {   --[[ sec gw instance 1 ]]
+          gwsec = {   --[[ sec gw instance 1 ]]
             key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
             remotes = {
               'ipv4 "%SEC" port 10%ID0',
-            },
-          },
-          gw02-2 = {   --[[ sec gw instance 2 ]]
-            key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
-            remotes = {
               'ipv4 "%SEC" port 10%ID1',
-            },
-          },
-          gw02-2 = {   --[[ sec gw instance 3 ]]
-            key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
-            remotes = {
               'ipv4 "%SEC" port 10%ID2',
             },
           },
diff --git a/site.mk b/site.mk
index b58994d..a030d0c 100644
--- a/site.mk
+++ b/site.mk
@@ -28,7 +28,8 @@ GLUON_SITE_PACKAGES := \
 	gluon-ebtables-filter-multicast-ffmuc \
 	gluon-ssid-changer \
 	respondd-module-airtime \
-	gluon-config-mode-site-select 
+	ffho-config-mode-site-select \
+	ffho-site-generate
 
 # basic support for USB stack
 USB_PACKAGES_BASIC := \