Merge pull request #3 from cajuskamer/0.11.2

0.11.5

Dockerfile

@@ -2,11 +2,13 @@ FROM debian:stretch
 MAINTAINER Cajus Kamer <Cajus.Kamer@arcor.de>
 
 ENV GLUON_SITE ffdo
-ENV GLUON_TAG v2017.1.3 
-ENV GLUON_RELEASE 0.11.3
+
+ENV GLUON_TAG v2017.1.5
+ENV GLUON_RELEASE 0.11.5
+
 ENV GLUON_BRANCH stable
 ENV GLUON_BROKEN 1
-ENV GLUON_TARGETS ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic x86-generic x86-64 
+ENV GLUON_TARGETS ar71xx-generic ar71xx-nand ar71xx-tiny ar71xx-mikrotik brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7621 x86-generic x86-64 
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_PRIORITY critical

docker-build.py

@@ -125,8 +125,8 @@ for target in targets:
     with open('%s/%s_cleanup.log' % (logdir, target), 'w') as log:
         print('Cleaning up...', end=''); stdout.flush()
     with open('%s/%s_cleanup.log' % (logdir, target), 'w') as log:
-        rc = call('make dirclean V=s', stdout=log, stderr=log, shell=True) # clean all
-        # rc = call('make clean GLUON_TARGET=%s V=s' % (target), stdout=log, stderr=log, shell=True) # clean target specific 
+        # rc = call('make dirclean V=s', stdout=log, stderr=log, shell=True) # clean all
+        rc = call('make clean GLUON_TARGET=%s V=s' % (target), stdout=log, stderr=log, shell=True) # clean target specific 
     if rc == 0:
         print('OK')
     else:

site.conf

@@ -11,9 +11,8 @@
 	regdom = 'DE',
 
 	opkg = {
-		lede = 'http://opkg.services.ffac/lede/snapshots/packages/%A',
 		extra = {
-                    gluon = 'http://opkg.services.ffac/modules/gluon-%GS-%GR/%S',
+                    gluon = 'http://update.services.ffdo.de/%GS/releases/%GR/modules/%S',
 		},
 	},
 
@@ -46,6 +45,11 @@
 		},
 	},
 
+        dns = {
+                cacheentries = 2000,
+                servers = { '2a03:2260:300a:1000::16', '2a03:2260:300a:1000::32', '2a03:2260:300a:1000::8', '2a03:2260:300a:1000::24', },
+        },
+
 	next_node = {
 		ip4 = '10.233.254.254',
 		ip6 = '2a03:2260:300a:1000::ffd0',

site.mk

@@ -17,6 +17,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-web-admin \
 	gluon-web-autoupdater \
 	gluon-web-network \
+	gluon-web-private-wifi \
 	gluon-web-wifi-config \
 	gluon-mesh-batman-adv-15 \
 	gluon-mesh-vpn-fastd \
@@ -58,6 +59,4 @@ GLUON_ATH10K_MESH ?= ibss
 # Languages to include
 GLUON_LANGS ?= en de
 
-# VERSION 
-GLUON_RELEASE=0.11.2