From bb7434f36bfee00ef34f66f3c48b46f4f783b277 Mon Sep 17 00:00:00 2001
From: Stefan Hoffmann <stefan@tro-mail.de>
Date: Thu, 15 Jun 2017 19:04:55 +0200
Subject: [PATCH] 2017.1 Changes

---
 modules   | 10 +---------
 site.conf | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/modules b/modules
index fada93c..970a100 100644
--- a/modules
+++ b/modules
@@ -1,14 +1,6 @@
 
-GLUON_SITE_FEEDS='tro ffrl airtime'
+GLUON_SITE_FEEDS='tro'
 
 PACKAGES_TRO_REPO=https://github.com/Freifunk-Troisdorf/packages.git
 PACKAGES_TRO_COMMIT=4f580ea0ce5e63a82376f484b04dfeeb7e6c0ae9
 PACKAGES_TRO_BRANCH=v2016.1
-
-PACKAGES_FFRL_REPO=https://github.com/ffrl/ffrl-packages
-PACKAGES_FFRL_BRANCH=Branch_v2016.1.x
-PACKAGES_FFRL_COMMIT=c6a6fd5ff2954495d8b6feae4094805d206917fc
-
-PACKAGES_AIRTIME_REPO=https://github.com/viisauksena/gluon-airtime.git
-PACKAGES_AIRTIME_COMMIT=640ff953364302f14a4a69ec02769b12068cc0b9
-PACKAGES_AIRTIME_BRANCH=master
diff --git a/site.conf b/site.conf
index 0d716b5..1b7bc6e 100644
--- a/site.conf
+++ b/site.conf
@@ -55,7 +55,7 @@
                     'http://update3.infra.fftdf/flu/stable/sysupgrade'
                 },
                 probability = 1.00,
-                good_signatures = 2,
+                good_signatures = 1,
                 pubkeys = {
                     '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914',     -- Stefan
                     '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7',     -- Kemal
@@ -114,17 +114,17 @@
         },
     },
     mesh_vpn = {
-    	tunneldigger = {
-	        mtu = 1312,
-	        brokers = {
-	            'flu1.freifunk-troisdorf.de:53842',
-	            'flu2.freifunk-troisdorf.de:53840'
-	            },
-	        bandwidth_limit = {
-	        	enabled = false,
-	        	egress = 2000,
-	        	ingress = 6000,
-	        	},
+        mtu = 1312,
+        tunneldigger = {
+            brokers = {
+                'flu1.freifunk-troisdorf.de:53842',
+                'flu2.freifunk-troisdorf.de:53840'
+                },
+            bandwidth_limit = {
+                enabled = false,
+                egress = 2000,
+                ingress = 6000,
+                },
             },
     },
     roles = {