Adapt site for gluon 2018.1.1

Dockerfile

@@ -3,8 +3,8 @@ MAINTAINER Cajus Kamer <Cajus.Kamer@arcor.de>
 
 ENV GLUON_SITE ffdo
 
-ENV GLUON_TAG v2017.1.8
-ENV GLUON_RELEASE 0.11.8
+ENV GLUON_TAG v2018.1.1
+ENV GLUON_RELEASE 0.12-test
 
 ENV GLUON_BRANCH stable
 ENV GLUON_BROKEN 1

site.conf

@@ -1,4 +1,9 @@
 {
+	-- 32 byte random data in hexadecimal encoding
+	-- This data must be unique among all sites and domains!
+	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
+	domain_seed = 'ba9b178cf40ecc6f1a0a53339c10c4bd056957d24643270389fe0298d713354d',
+
 	hostname_prefix = 'FF-DO-',
 	site_name = 'Freifunk Dortmund',
 	site_code = 'ffdo',
@@ -51,6 +56,10 @@
 		mac = '02:ff:d0:09:ff:02',
 	},
 
+	mesh = {
+	     vxlan = false,
+	},
+
 	mesh_vpn = {
 		-- enabled = true,
 		mtu = 1280,
@@ -155,6 +164,9 @@
 		geo_location = {
 			show_altitude = false,
 		},
+		remote_login = {
+			show_password_form = true,
+		},
 	},
 
 }

site.mk

@@ -1,33 +1,35 @@
 ##	gluon site.mk makefile example
 
+##	GLUON_FEATURES
+#		Specify Gluon features/packages to enable;
+#		Gluon will automatically enable a set of packages
+#		depending on the combination of features listed
+
+GLUON_FEATURES := \
+	autoupdater \
+	ebtables-filter-multicast \
+	ebtables-filter-ra-dhcp \
+	ebtables-limit-arp \
+	mesh-batman-adv-15 \
+	mesh-vpn-fastd \
+	radvd \
+	respondd \
+	status-page \
+	web-advanced \
+	web-private-wifi \
+	web-wizard
+
 ##	GLUON_SITE_PACKAGES
-#		specify Gluon/LEDE packages to include here
+#		Specify additional Gluon/OpenWrt packages to include here;
+#		A minus sign may be prepended to remove a packages from the
+#		selection that would be enabled by default or due to the
+#		chosen feature flags
 
 GLUON_SITE_PACKAGES := \
-	gluon-respondd \
-	gluon-autoupdater \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-contact-info \
-	gluon-config-mode-core \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
-	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 \
-	gluon-radvd \
-	gluon-setup-mode \
-	gluon-status-page \
 	haveged \
-	iptables \
-	iwinfo
-	
+	iwinfo \
+	iptables
+
 ##	DEFAULT_GLUON_RELEASE
 #		version string to use for images
 #		gluon relies on