From e9adb3b3d03449874d4653647889494b75285664 Mon Sep 17 00:00:00 2001 From: Marvin Gaube Date: Sat, 18 Jan 2020 15:15:36 +0100 Subject: [PATCH 1/5] Enable Domain-Director --- site.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/site.conf b/site.conf index 37e093c00..88a7830e0 100644 --- a/site.conf +++ b/site.conf @@ -40,6 +40,7 @@ }, domain_director = { + enabled = true, url = 'http://director.ffffm.net/', switch_after_offline = 360, }, From bea9060ff7b404b95d0e37af08600c566b45735c Mon Sep 17 00:00:00 2001 From: Marvin Gaube Date: Sat, 18 Jan 2020 15:17:23 +0100 Subject: [PATCH 2/5] v4.2.1-test --- site.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.mk b/site.mk index 1faf52d82..f065a2a93 100644 --- a/site.mk +++ b/site.mk @@ -32,10 +32,10 @@ GLUON_MULTIDOMAIN := 1 # This is the Stable branch # Gluon Base Release -DEFAULT_GLUON_RELEASE := v4.2 +DEFAULT_GLUON_RELEASE := v4.2.1 # Development branch information -GLUON_BRANCH ?= stable +GLUON_BRANCH ?= test DEFAULT_GLUON_RELEASE := $(DEFAULT_GLUON_RELEASE)-$(GLUON_BRANCH)-$(shell date '+%m%d') From 1fb7a5ab06db4c898ecf1ba953d68d99667b3b06 Mon Sep 17 00:00:00 2001 From: Marvin Gaube Date: Sat, 18 Jan 2020 18:00:32 +0100 Subject: [PATCH 3/5] Add Gluon-Web-FFDA-Domain-Director --- site.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/site.mk b/site.mk index f065a2a93..38be54b41 100644 --- a/site.mk +++ b/site.mk @@ -21,6 +21,7 @@ GLUON_SITE_PACKAGES := \ ffffm-button-bind \ respondd-module-airtime \ ffda-domain-director \ + gluon-web-ffda-domain-director \ include $(GLUON_SITEDIR)/specific_site.mk From 2451f0dfe21b59ea246ff7d3d82546bf11b00b39 Mon Sep 17 00:00:00 2001 From: Marvin Gaube Date: Sat, 18 Jan 2020 21:13:04 +0100 Subject: [PATCH 4/5] Fix Tab/Space --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 88a7830e0..c0a690f8d 100644 --- a/site.conf +++ b/site.conf @@ -40,7 +40,7 @@ }, domain_director = { - enabled = true, + enabled = true, url = 'http://director.ffffm.net/', switch_after_offline = 360, }, From ccc5e1687b56ab1281b67bb86db470bbf6ebe222 Mon Sep 17 00:00:00 2001 From: Marvin Gaube Date: Sun, 19 Jan 2020 12:04:32 +0100 Subject: [PATCH 5/5] Release v4.2.1-stable --- README.md | 5 +++++ site.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7cf2b583c..96285312c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ ## Stable-Version der Frankfurter Freifunkfirmware +### v4.2.1-stable-0118 +- Erstellt am 18.01.2019 +- Fix für v4.2: Domain Director aktiv +- Basis ist Gluon [v2019.1.1](https://gluon.readthedocs.io/en/v2019.1.1/) + ### v4.2-stable-0111 - Erstellt am 11.01.2019 - Multidomain-fähig diff --git a/site.mk b/site.mk index 38be54b41..561520fc9 100644 --- a/site.mk +++ b/site.mk @@ -36,7 +36,7 @@ GLUON_MULTIDOMAIN := 1 DEFAULT_GLUON_RELEASE := v4.2.1 # Development branch information -GLUON_BRANCH ?= test +GLUON_BRANCH ?= stable DEFAULT_GLUON_RELEASE := $(DEFAULT_GLUON_RELEASE)-$(GLUON_BRANCH)-$(shell date '+%m%d')