From dfdddf238178ea7064aea346ecaaf21fcb712353 Mon Sep 17 00:00:00 2001
From: Cyrus Fox <cyrus@lambdacore.de>
Date: Mon, 4 Nov 2019 23:37:51 +0100
Subject: [PATCH] =?UTF-8?q?v1.8.0=20(Gluon=202019.1)=20-------------------?=
 =?UTF-8?q?-------------=20-=20Switched=20to=20Gluon=202019.1=20-=20Update?=
 =?UTF-8?q?d=20FF=20D=C3=BCsseldorf=20watchdog=20to=20check=20for=20tunnel?=
 =?UTF-8?q?=20creation=20bug=20and=20removed=20redundant=20checks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Changelog.md  |  6 ++++
 migrator.json | 89 ++-------------------------------------------------
 modules       |  4 +--
 site.conf     | 10 +++---
 site.mk       |  5 ++-
 5 files changed, 19 insertions(+), 95 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 05d303f..c4b0aec 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,10 @@
 Changelog for Freifunk Düsseldorf & Neuss gluon firmware
+
+v1.8.0 (Gluon 2019.1)
+--------------------------------
+- Switched to Gluon 2019.1
+- Updated FF Düsseldorf watchdog to check for tunnel creation bug and removed redundant checks
+
 v1.7.3 (Gluon 2018.2.3)
 --------------------------------
 - Switched to Gluon 2018.2.3
diff --git a/migrator.json b/migrator.json
index 62ab926..817770e 100644
--- a/migrator.json
+++ b/migrator.json
@@ -1,91 +1,6 @@
 {
-    "timestamp": "2019-03-26T13:20:26.300Z",
+    "timestamp": "2019-11-04T23:29:31.300Z",
     "remigrate": false,
     "version": "1",
-    "nodes": [
-        {
-            "node_id": "ec086b6c6614",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "d46e0ed032c4",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "d46e0ed03290",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "18d6c751668e",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "d46e0ed032b0",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "18d6c751a93e",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "18d6c7516578",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "18d6c75165fc",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "d46e0ef5c2d2",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "18d6c7515212",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "ec086b6c5b58",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "d46e0ef5c35a",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "d46e0ed033d0",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "ec086b6c5dea",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "18d6c751668a",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "18a6f759ee26",
-            "domain": "ffneuss_dom5"
-        },
-        {
-            "node_id": "ec086ba4cba0",
-            "domain": "ffneuss_dom5"
-        },
-        {
-            "node_id": "18a6f7c5dd96",
-            "domain": "ffneuss_dom5"
-        },
-        {
-            "node_id": "30b5c23e96d0",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "8416f9e8a86e",
-            "domain": "legacy_neuss"
-        },
-        {
-            "node_id": "c4e984f7c2bc",
-            "domain": "legacy_neuss"
-        }
-    ]
+    "nodes": []
 }
\ No newline at end of file
diff --git a/modules b/modules
index a9ba64f..47c36e8 100644
--- a/modules
+++ b/modules
@@ -2,5 +2,5 @@ GLUON_SITE_FEEDS='ffddorf'
 
 #FFDORF Packages
 PACKAGES_FFDDORF_REPO=https://github.com/ffddorf/ddorf-packages.git
-PACKAGES_FFDDORF_COMMIT=a9e22740002a00d08596c7ddc2f0b12a41e44ace
-PACKAGES_FFDDORF_BRANCH=Branch_v2018.x
+PACKAGES_FFDDORF_COMMIT=13713009427a72437af3955030efb38868a9d304
+PACKAGES_FFDDORF_BRANCH=Branch_v2019.x
diff --git a/site.conf b/site.conf
index 4914867..d5e515a 100644
--- a/site.conf
+++ b/site.conf
@@ -19,10 +19,13 @@
             show_password_form = true,
         },
     },
+    mesh = {
+        batman_adv = {
+            routing_algo = 'BATMAN_IV'
+        },
+    },
     wifi24 = {
         channel = 11,
-        supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-        basic_rate = {6000, 12000, 24000},
         mesh = {
           mcast_rate = 12000,
           disabled = false,
@@ -54,7 +57,6 @@
                     'http://1.updates.freifunk-duesseldorf.de/stable/sysupgrade',
                     'http://2.updates.freifunk-duesseldorf.de/stable/sysupgrade',
                 },
-                probability = 0.08,
                 good_signatures = 2,
                 pubkeys = {
                     'cb79f3377ad78c0782a38e0fb6fc2a34270ca4c89c9e971b201a89bf8ddcd96f', -- CyrusFox (Freifunk Düsseldorf)
@@ -69,7 +71,6 @@
                     'http://1.updates.freifunk-duesseldorf.de/beta/sysupgrade',
                     'http://2.updates.freifunk-duesseldorf.de/beta/sysupgrade',
                 },
-                probability = 0.08,
                 good_signatures = 1,
                 pubkeys = {
                     'cb79f3377ad78c0782a38e0fb6fc2a34270ca4c89c9e971b201a89bf8ddcd96f', -- CyrusFox (Freifunk Düsseldorf)
@@ -84,7 +85,6 @@
                     'http://1.updates.freifunk-duesseldorf.de/experimental/sysupgrade',
                     'http://2.updates.freifunk-duesseldorf.de/experimental/sysupgrade',
                 },
-                probability = 0.08,
                 good_signatures = 1,
                 pubkeys = {
                     'cb79f3377ad78c0782a38e0fb6fc2a34270ca4c89c9e971b201a89bf8ddcd96f', -- CyrusFox (Freifunk Düsseldorf)
diff --git a/site.mk b/site.mk
index 5f6b099..4d7bd1d 100644
--- a/site.mk
+++ b/site.mk
@@ -8,7 +8,6 @@ GLUON_FEATURES := \
 	ebtables-source-filter \
 	mesh-batman-adv-15 \
 	mesh-vpn-tunneldigger \
-	radvd \
 	respondd \
 	status-page \
 	web-advanced \
@@ -79,3 +78,7 @@ GLUON_ATH10K_MESH ?= 11s
 GLUON_REGION := eu
 
 GLUON_MULTIDOMAIN=1
+
+# Do not build images for deprecated devices
+GLUON_DEPRECATED ?= 1
+