From 333167ade26d1e9f5d854ad2c4f6aee5dcd430a2 Mon Sep 17 00:00:00 2001
From: rubo77 <github@r.z11.de>
Date: Mon, 18 Jun 2018 19:00:48 +0200
Subject: 2017.1.8 - Kontaktfeld ist nicht mehr Pflicht

---
 CHANGELOG.md    | 19 +++++++++++++++----
 README.md       |  4 +++-
 make-release.sh |  2 +-
 site.conf       |  7 ++++---
 site.mk         |  4 ++--
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab6953b..175b631 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,10 @@
-Änderungen mit Firmwareversion 2017.1.7 basierend auf Gluon 2017.1.7
+Änderungen mit Firmwareversion 2017.1.8 basierend auf Gluon 2017.1.8
 ====================================================================
 
 Freifunk Kiel spezifische Änderungen:
 -------------------------------------
 
- * Neu: gluon-alt-esc [1] erlaubt den lokalen Knoten für andere Knoten als lokalen Exit bereitzustellen
-
- - [1] - https://github.com/rubo77/gluon-alt-esc
+ * Kontaktfeld ist nicht mehr Pflicht
 
 Offizielle Changelogs zum nachlesen:
 ------------------------------------
@@ -19,7 +17,20 @@ Offizielle Changelogs zum nachlesen:
 * https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.5.html
 * https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.6.html
 * https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.7.html
+* https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.7.html
+
+<br>
+
+Änderungen mit Firmwareversion 2017.1.7 basierend auf Gluon 2017.1.7
+====================================================================
+
+Freifunk Kiel spezifische Änderungen:
+-------------------------------------
+
+ * Neu: gluon-alt-esc [1] erlaubt den lokalen Knoten für andere Knoten als lokalen Exit bereitzustellen
 
+ - [1] - https://github.com/rubo77/gluon-alt-esc
+ 
 <br>
 
 Änderungen mit Firmwareversion 2016.2.7 basierend auf Gluon 2016.2.7
diff --git a/README.md b/README.md
index e85b4d7..aca4dfa 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Firmware Site Config for Freifunk Kiel
 --------------------------------------
 
-The Freifunk firmware is based on gluon.
+The Freifunk nightly firmware is based on gluon branch 2017.1.x
 
 You can always find
 the latest gluon documentation at:
@@ -53,6 +53,8 @@ You can validate your changes to this repository by calling the validate_site.sh
 
 These Kieler Freifunk firmwares have been released:
 
+- 2016.2.7
+  - Based on Gluon 2016.2.7
 - 2016.2.6.2
   - Based on Gluon 2016.2.6
   - Deactivated legacy ibss meshing protocol
diff --git a/make-release.sh b/make-release.sh
index b51f3d6..b7812d0 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -15,7 +15,7 @@ set -u
 set -e
 
 # if version is unset, will use the default nightly version from site.mk
-VERSION=${3:-"2017.1.7~ngly$(date '+%y%m%d%H%M')"}
+VERSION=${3:-"2017.1.8~ngly$(date '+%y%m%d%H%M')"}
 # branch must be set to either rc, nightly or stable
 BRANCH=${2:-"stable"}
 # must point to valid ecdsa signing key created by ecdsakeygen, relative to Gluon base directory
diff --git a/site.conf b/site.conf
index 13058e1..54fd519 100644
--- a/site.conf
+++ b/site.conf
@@ -34,9 +34,10 @@
             show_altitude = true,
         },
         -- define if the contact field is obligatory (optional)
-        owner = {
-            obligatory = true
-        },
+        -- disabled in 2017.1.8
+        -- owner = {
+            -- obligatory = true
+        -- },
     },
 
     ddhcpd = {
diff --git a/site.mk b/site.mk
index 832d952..e25ca9c 100644
--- a/site.mk
+++ b/site.mk
@@ -53,8 +53,8 @@ GLUON_SITE_PACKAGES += \
 
 # Always call `make` from the command line with the desired release version!
 # otherwise this is generated:
-#DEFAULT_GLUON_RELEASE := 2017.1.7
-DEFAULT_GLUON_RELEASE := 2017.1.7~ngly$(shell date '+%y%m%d')
+#DEFAULT_GLUON_RELEASE := 2017.1.8
+DEFAULT_GLUON_RELEASE := 2017.1.8~ngly$(shell date '+%y%m%d')
 
 
 # Allow overriding the release number from the command line
-- 
cgit v1.2.3