Merge pull request #50 from freifunk-ffm/next

v4.2.1
freifunk-ffm · Jan 19, 2020 · 9d1b05b · 9d1b05b
2 parents a5e0888 + ccc5e16
commit 9d1b05b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git 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.conf b/site.conf
@@ -40,6 +40,7 @@
   },
 
   domain_director = {
+    enabled = true,
     url = 'http://director.ffffm.net/',
     switch_after_offline = 360,
   },

diff --git 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
 
@@ -32,7 +33,7 @@ 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