changes for 1.1.4-beta

- re-enabled ffggrz-packages since it's used for web-mesh-vpn-select
- added dns section for tests with the pihole

modules

@@ -6,21 +6,20 @@
 ##	GLUON_SITE_FEEDS
 #		for each feed name given, add the corresponding PACKAGES_* lines
 #		documented below
-#GLUON_SITE_FEEDS='ffggrz_packages ffrl_packages'
-GLUON_SITE_FEEDS='ffrl_packages'
+GLUON_SITE_FEEDS='ffggrz_packages ffrl_packages'
+#GLUON_SITE_FEEDS='ffrl_packages'
 
 ##	PACKAGES_$feedname_REPO
 #		the  git repository from where to clone the package feed
-#PACKAGES_FFGGRZ_PACKAGES_REPO=https://github.com/ffggrz/ffggrz-packages.git
-PACKAGES_FFRL_PACKAGES_REPO=https://github.com/ffrl/ffrl-packages
+PACKAGES_FFGGRZ_PACKAGES_REPO=https://github.com/ffggrz/ffggrz-packages.git
+PACKAGES_FFRL_PACKAGES_REPO=https://github.com/ffrl/ffrl-packages.git
 
 ##	PACKAGES_$feedname_COMMIT
 #		the version/commit of the git repository to clone
-#PACKAGES_FFGGRZ_PACKAGES_COMMIT=2224eda334f6dd572196889a932d438361c2b9ed
+PACKAGES_FFGGRZ_PACKAGES_COMMIT=2224eda334f6dd572196889a932d438361c2b9ed
 PACKAGES_FFRL_PACKAGES_COMMIT=434f2181290b129bdfbb09ca16e1d9696c8327be
 
 ##  PACKAGES_$feedname_BRANCH
 #   the branch to check out
-#PACKAGES_FFGGRZ_PACKAGES_BRANCH=master
+PACKAGES_FFGGRZ_PACKAGES_BRANCH=master
 PACKAGES_FFRL_PACKAGES_BRANCH=master
-

site.conf

@@ -15,6 +15,13 @@
                  'fdb5:78b:64cc::13',
   },
 
+  dns = {
+    cacheentries = 5000,
+    servers = {'fdb5:78b:64cc::11',
+               'fdb5:78b:64cc::12',
+               'fdb5:78b:64cc::13',},
+  },
+
   regdom = 'DE',
 
   wifi24 = {

site.mk

@@ -62,5 +62,5 @@ GLUON_LANGS ?= en de
 # Mesh protocol
 GLUON_WLAN_MESH ?= 11s
 
-# auch als "kaputt" deklarierte Firmware bauen
+# Build images also for devices marked broken
 BROKEN ?= 1