From 532dce322c9dd2d144daf773e0005e6a76eb88db Mon Sep 17 00:00:00 2001
From: Bastian <mephisto@mephis.to>
Date: Fri, 26 Jan 2018 22:06:16 +0100
Subject: [PATCH] Changes due to Integration to Gluon Master

---
 Makefile               |  8 ++++----
 domains/ffrgb.conf     |  5 +++--
 domains/ffrgb_cty.conf |  5 +++--
 domains/ffrgb_tst.conf |  5 +++--
 domains/ffrgb_uml.conf |  5 +++--
 site.conf              | 24 +-----------------------
 site.mk                |  1 +
 7 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/Makefile b/Makefile
index 8792c53..4a386e2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon
-GLUON_GIT_REF := 6ae067cb379436bc915b2a5e6865106e9fb24c29
+GLUON_GIT_URL := https://github.com/ffrgb/gluon
+GLUON_GIT_REF := 521db49ffbfc20c4755840803cd543070cd7779f
 
 #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
 GLUON_TARGETS ?= \
-	x86-64 \
 	ar71xx-generic \
+	x86-64 \
 	ar71xx-tiny \
 	ar71xx-nand \
 	brcm2708-bcm2708 \
@@ -33,7 +33,7 @@ JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
 
 #JOBS = 1
 
-GLUON_MAKE := ${MAKE} BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \
+GLUON_MAKE := ${MAKE} V=s BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 			GLUON_RELEASE=${GLUON_RELEASE} \
 			GLUON_BRANCH=${GLUON_BRANCH} \
 
diff --git a/domains/ffrgb.conf b/domains/ffrgb.conf
index bc963d7..db99c64 100644
--- a/domains/ffrgb.conf
+++ b/domains/ffrgb.conf
@@ -1,6 +1,5 @@
 {
-  domain_name = 'Legacy',
-  domain_code = 'ffrgb',
+  domain_names = { ffrgb = 'Legacy' },
   domain_seed = 'c8951e3a104d55543da98ee732468ea121878e77c6d18cbcbefb5409c292601a',
   hide_domain = true,
 
@@ -80,11 +79,13 @@
         },
       },
     },
+    --[[ old
     bandwidth_limit = {
       enabled = false,
       ingress = 12000,
       egress = 1200,
     },
+    ]]
   },
 
   autoupdater = {
diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf
index b46df83..dec239d 100644
--- a/domains/ffrgb_cty.conf
+++ b/domains/ffrgb_cty.conf
@@ -1,6 +1,5 @@
 {
-  domain_name = 'Regensburg Stadtgebiet',
-  domain_code = 'ffrgb_cty',
+  domain_names = { ffrgb_cty = 'Regensburg Stadt' },
   domain_seed = '1124de9b0fe2dde424c8a4c481816b5899e6d1b4b4cf72de42136c4f1f197c7a',
 
   opkg = {
@@ -95,11 +94,13 @@
         },
       },
     },
+    --[[ old
     bandwidth_limit = {
       enabled = false,
       ingress = 12000,
       egress = 1200,
     },
+    ]]
   },
 
   autoupdater = {
diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf
index d854257..3af7331 100644
--- a/domains/ffrgb_tst.conf
+++ b/domains/ffrgb_tst.conf
@@ -1,6 +1,5 @@
 {
-  domain_name = 'Regensburg Testumgebung',
-  domain_code = 'ffrgb_tst',
+  domain_names = { ffrgb_tst = 'Regensburg Testumgebung' },
   domain_seed = 'bcd0ceca2c68b5b9a5975156a0ec0a04aebe3300d9928a04dc57001cc96db252',
   hide_domain = true,
 
@@ -96,11 +95,13 @@
         },
       },
     },
+    --[[ old
     bandwidth_limit = {
       enabled = false,
       ingress = 12000,
       egress = 1200,
     },
+    ]]
   },
 
   autoupdater = {
diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf
index cacb70f..2a5c728 100644
--- a/domains/ffrgb_uml.conf
+++ b/domains/ffrgb_uml.conf
@@ -1,6 +1,5 @@
 {
-  domain_name = 'Regensburg Umland',
-  domain_code = 'ffrgb_uml',
+  domain_names = { ffrgb_uml = 'Regensburg Umland' },
   domain_seed = 'f3d54e3dfc4108dd3356664bbab4baef3b2920ad943c27edce4b284a68e776fd',
 
   opkg = {
@@ -95,11 +94,13 @@
         },
       },
     },
+    --[[ old
     bandwidth_limit = {
       enabled = false,
       ingress = 12000,
       egress = 1200,
     },
+    ]]
   },
 
   autoupdater = {
diff --git a/site.conf b/site.conf
index 03adc6e..c0b04a6 100644
--- a/site.conf
+++ b/site.conf
@@ -2,7 +2,7 @@
   hostname_prefix = '',
   site_name = 'Freifunk Regensburg',
   site_code = 'ffrgb',
-  default_domain_code = 'ffrgb',
+  default_domain = 'ffrgb',
 
   opkg = {
     --[[ old
@@ -18,28 +18,6 @@
 
   regdom = 'DE',
 
-  wifi24 = {
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
-    channel = 1,
-    ap = {
-      ssid = 'regensburg.freifunk.net',
-    },
-    ibss = {
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'regensburg.freifunk.net',
-    },
-    ibss = {
-      mcast_rate = 12000,
-    }
-  },
-
   mesh_vpn = {
     mtu = 1426,
     fastd = {
diff --git a/site.mk b/site.mk
index 3d5d9a1..89e858a 100644
--- a/site.mk
+++ b/site.mk
@@ -215,3 +215,4 @@ GLUON_PRIORITY ?= 0
 # Languages to include
 GLUON_LANGS ?= en de
 GLUON_WLAN_MESH := ibss
+GLUON_MULTIDOMAIN=1