Merge branch 'beta' into HEAD

site.conf

@@ -8,9 +8,9 @@
 
         timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
         ntp_servers = {
-            '172.21.24.1','172.21.24.129', 'fd21:b4dc:4b1e::a38:1', -- gluongw
+            'fd21:b4dc:4b1e::a38:1', -- gw01
         },
-        opkg_repo = 'http://[fd21:b4dc:4b1e::a38:1]/gluon/stable/%S/packages',
+        opkg_repo = 'http://[fd21:b4dc:4b1e::a38:1]/openwrt/barrier_breaker/14.07/%S/packages',
         regdom = 'DE',
 
         wifi24 = {
@@ -24,7 +24,7 @@
         wifi5 = {
                 ssid = 'stuttgart.freifunk.net',
                 channel = 44,
-                htmode = 'HT40+',
+                htmode = 'HT20',
                 mesh_ssid = '02:04:08:16:32:64',
                 mesh_bssid = '02:04:08:16:32:64',
                 mesh_mcast_rate = 12000,
@@ -37,7 +37,7 @@
         },
 
       fastd_mesh_vpn = {
-                methods = {'salsa2012+gmac'},
+                methods = {'salsa2012+umac'},
                 mtu = 1406,
                 enabled = true,
                 backbone = {
@@ -72,7 +72,7 @@
                                         remotes = {'"gw07.freifunk-stuttgart.de" port 10037'},
                                 },
                                 gw08 = {
-                                        key = 'f6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
+                                        key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
                                         remotes = {'"gw08.freifunk-stuttgart.de" port 10037'},
                                 },
                                 gw09 = {
@@ -96,7 +96,6 @@
                                 mirrors = {
                                         'http://[fd21:b4dc:4b1e::a38:1]/gluon/stable/sysupgrade', -- gluongw
                                 },
-                                probability = 0.08,
                                 good_signatures = 1,
                                 pubkeys = {
                                         'eb609ccaa68d681aadbc4d00a4b0870f6cb1559ac9d280f590beee595ac4bc39', -- leonard
@@ -107,7 +106,6 @@
                                 mirrors = {
                                         'http://[fd21:b4dc:4b1e::a38:1]/gluon/beta/sysupgrade', -- gluongw
                                 },
-                                probability = 0.1,
                                 good_signatures = 1,
                                 pubkeys = {
                                         'eb609ccaa68d681aadbc4d00a4b0870f6cb1559ac9d280f590beee595ac4bc39', -- leonard
@@ -118,7 +116,6 @@
                                 mirrors = {
                                         'http://[fd21:b4dc:4b1e::a38:1]/gluon/nightly/sysupgrade', -- gluongw
                                 },
-                                probability = 1.00,
                                 good_signatures = 1,
                                 pubkeys = {
                                         'eb609ccaa68d681aadbc4d00a4b0870f6cb1559ac9d280f590beee595ac4bc39', -- leonard

site.mk

@@ -3,26 +3,27 @@ GLUON_SITE_PACKAGES := \
 	gluon-alfred \
 	gluon-announced \
 	gluon-autoupdater \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
-	gluon-config-mode-hostname \
 	gluon-config-mode-autoupdater \
-	gluon-config-mode-mesh-vpn \
-	gluon-config-mode-geo-location \
 	gluon-config-mode-contact-info \
-	gluon-luci-private-wifi \
+	gluon-config-mode-geo-location \
+	gluon-config-mode-hostname \
+	gluon-config-mode-mesh-vpn \
+	gluon-ebtables-filter-multicast \
+	gluon-ebtables-filter-ra-dhcp \
 	gluon-luci-admin \
 	gluon-luci-autoupdater \
 	gluon-luci-portconfig \
-	gluon-mesh-vpn-fastd \
+	gluon-luci-private-wifi \
+	gluon-neighbour-info \
 	gluon-next-node \
+	gluon-mesh-vpn-fastd \
 	gluon-radvd \
 	gluon-status-page \
-	iwinfo \
+	haveged \
 	iptables \
-	haveged
+	iwinfo
 
-DEFAULT_GLUON_RELEASE := 0.1+0-$(shell date '+%Y.%m.%d-%H.%M')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
+DEFAULT_GLUON_RELEASE := 0.2+0-$(shell date '+%Y.%m.%d-%H.%M')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)