Adapt config for Breminale

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "gluon"]
 	path = gluon
-	url = https://github.com/freifunk-gluon/gluon.git
+	url = https://github.com/FreifunkBremen/gluon.git

gluon

@@ -1 +1 @@
-Subproject commit e54e3dc41046d9334d515f87397c436451c964ad
+Subproject commit dc761c9bf47deb034f54c7ce072154eb353d27cd

modules

@@ -1,4 +1,5 @@
 GLUON_SITE_FEEDS='ffhb'
 
 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
-PACKAGES_FFHB_COMMIT=93bfe6b062c89ab4bedb132ca4d75e432598fabb
+PACKAGES_FFHB_BRANCH=breminale
+PACKAGES_FFHB_COMMIT=ec3b1f427edb462d9db09ab3ec73b56e67a8a1ff

site.conf

@@ -1,4 +1,10 @@
 {
+	authorized_keys = {
+		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6R6Rnd0JqvSng8Dkv8jKHxCkBC0G6iTjMPYX6aN3iJIOIiBFBXcJoq1NWI+GTabdN8xhDLSUqeBsDa0yqkgx3r3qdMUjT2cQVxw0nnBw5OXGSsWnepT9cWIrUw7FoKJtYFkaN9C1tKO/Jbld2rbAb21S7uL8K9of5nOZCYP5OHlyfMJdjS0p01m7Onl2O+q1Nb99GfhpIcXJkxKQwXgNpNVsr7JemPrvkAp+eUrdGwApyVtUSodpuuHFwtm7OVOR5WNrSGBD+pCgtBHFCoYI4/RKD+UUqHI1tA9IW8bZgyiKacTLygUCQYZyJuR/mc9MjREzXO086LHKqyJJ48EDlHaTMbwh528fD9O7XQUxv2OV4SNqiMrZR+4lHCl2PziQXM0lTOWyCZhURuQwyfxGsyDmL+wr8YfeYhOTKcHoQ2h6rbjSp27Vk2Kn5UxYQVpaiUHmqLX2wS2B+B1Xapm9F6QZZSuCyVFEQkPqFn8QH2vxG9GUsC5xacrgP0LCETL81f6Kvz1gA6ppR988JNNHDARYApbVBdFxTaP4Ytw7FfKnvizmvFcEJoQuV9sAa9ipF4BWM8dY/GqS36qliDk5s+vSvslSqij9/kUKA6Tw2aBzga7sz86+mY7lv7R+Q5B89T4sb6F8dqc/zAH7DA5UgU+HkVBrfa9azqdfHbZPMYw== jplitza',
+		'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEApbOykvAWPeeBoh9U1qw2Hxe80GXv9B/J6CK0m5vGBY0w7ZqqN/AwyG3N3V0DEI1yxvxZboRug1FslmvEQZiFknrKwzPNaRJnD9ijSdJOhpSJI/7aYqUniZGWbtw/03i4f58kPNjLWuo3ILsdT4WmSbBgmBygCNflUlptWHRYm24ix21HclxlfroGdR/c5wBrHfVlB79DdrKz+upXEvD6M4uEoPBOXoEqbq7ntymtD8N4Gz5t8bH6x55LmZYn7fPAbWa1CCAIEWVvVpNsGpxmWdNIg9WysUrpSRuzoFIXde58m4lH7kH5nDKCMnfRnT+Lfrxgb0w1WvWAAHtxXpcjkQ== julian@r2h',
+		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDpQCO+IrWOwabZgxNQsESucaTnb+Tw0D5d9qEuWSlciQZjFgHc8HoFrOCWpOw+JBQikt44U3ZpUEKfArLaWoZjqzR7N/MeLYfBIm1D9jtmydxCEJHplsj2KwVRWVALN3kKlIBZe6ltOTyKVNKyh/xTRiESbYss5hl5gGxCSRrr4IhNKFseIBtaSgT6ysxUQnRxsPUHTz916/bvOP4JMu6yfhD9Zt2y2yWnz4F9zBc8mVbhB8i35D1ok3K8m+Zj9FYKu2m+95o/phOS/VPEj/8+ZjmGvMxrm08duH6grKIRbR96tBPHTk8FCHDqQU3fE85pqqcw2zovtSaqYkxfCvJvS/cLmU7quvzZGGvuxcI1IcrdD+txm8tAUnJiTu1h18NMoK6hZ4bCgjhPoBpoUMdy+lfXdpLfv/ZGiPhJUOtbMJOyVCzwbmHs9NeBl/bQ2FkMHQ6jjGQSSN04KHRbptEYLmgNHxgpnepmaeJemSHFSs9yDbEfVvo+Qj/6+FfAviMk4eKIOibDFgth0CzEBW1H4r7wm5E1P8DeIOaf1/Oqf9Ho1Up4YcRxN1vtqI3L7Yanv4riHey4C61alo8t58D8SVRbogKfb0GBWalP2ABdI/fXNeLK92wG4jM6Tu4MqmQ5dkbg66uvhMVKL43hdf2pG2ZW2GNtm+IfbfQJI+99SQ== breminale',
+	},
+	hostname_prefix = 'breminale-',
 	site_name = 'Freifunk Bremen',
 	site_code = 'ffhb',
 
@@ -17,6 +23,7 @@
 		ssid = 'bremen.freifunk.net',
 		channel = 6,
 		htmode = 'HT20',
+		mesh_disable = true,
 		mesh_ssid = 'mesh.ffhb.de',
 		mesh_bssid = '32:06:1C:1F:B9:E8',
 		mesh_mcast_rate = 6000,
@@ -25,6 +32,7 @@
 		ssid = 'bremen.freifunk.net',
 		channel = 44,
 		htmode = 'HT40+',
+		mesh_disable = true,
 		mesh_ssid = 'mesh.ffhb.de',
 		mesh_bssid = '32:06:1C:1F:B9:E8',
 		mesh_mcast_rate = 6000,

site.mk

@@ -1,26 +1,7 @@
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-14 \
+	ffhb-breminale \
 	gluon-alfred \
-	gluon-announced \
-	gluon-autoupdater \
-	gluon-config-mode-core \
-	gluon-config-mode-hostname \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-mesh-vpn \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-contact-info \
-	gluon-ebtables-filter-ra-dhcp \
-	gluon-luci-admin \
-	gluon-luci-autoupdater \
-	gluon-luci-portconfig \
-	gluon-luci-private-wifi \
-	gluon-mesh-vpn-fastd \
-	gluon-next-node \
-	gluon-radvd \
-	gluon-setup-mode \
-	gluon-speedtest \
-	gluon-status-page \
-	gluon-wan-dnsmasq-static \
+	gluon-authorized-keys \
 	iputils-ping6 \
 	iwinfo \
 	iptables \
@@ -28,7 +9,7 @@ GLUON_SITE_PACKAGES := \
 	firewall \
 	haveged
 
-DEFAULT_GLUON_RELEASE := 0.7~+nightly$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 2015.1.1+breminale1
 DEFAULT_GLUON_PRIORITY := 0
 
 # Allow overriding the release number and languages from the command line