Merge branch 'beta' for version 0.3

site.conf

@@ -14,7 +14,7 @@
         regdom = 'DE',
 
         wifi24 = {
-                ssid = 'stuttgart.freifunk.net',
+                ssid = 'Freifunk',
                 channel = 1,
                 htmode = 'HT20',
                 mesh_ssid = '02:04:08:16:32:64',
@@ -22,7 +22,7 @@
                 mesh_mcast_rate = 12000,
         },
         wifi5 = {
-                ssid = 'stuttgart.freifunk.net',
+                ssid = 'Freifunk',
                 channel = 44,
                 htmode = 'HT20',
                 mesh_ssid = '02:04:08:16:32:64',
@@ -33,7 +33,7 @@
         next_node = {
                 ip4 = '172.21.24.254',
                 ip6 = 'fd21:b4dc:4b1e::1',
-                mac = '02:00:0a:25:00:01', -- http://freifunk-stuttgart.de/mac.html
+                mac = '02:00:0a:25:00:01',
         },
 
       fastd_mesh_vpn = {
@@ -98,7 +98,7 @@
                                 },
                                 good_signatures = 1,
                                 pubkeys = {
-                                        'eb609ccaa68d681aadbc4d00a4b0870f6cb1559ac9d280f590beee595ac4bc39', -- leonard
+                                        '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
                                 },
                         },
                         beta = {
@@ -108,7 +108,7 @@
                                 },
                                 good_signatures = 1,
                                 pubkeys = {
-                                        'eb609ccaa68d681aadbc4d00a4b0870f6cb1559ac9d280f590beee595ac4bc39', -- leonard
+                                        '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
                                 },
                         },
                         nightly = {
@@ -118,7 +118,7 @@
                                 },
                                 good_signatures = 1,
                                 pubkeys = {
-                                        'eb609ccaa68d681aadbc4d00a4b0870f6cb1559ac9d280f590beee595ac4bc39', -- leonard
+                                        '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
                                 },
                         },
                 },

site.mk

@@ -23,7 +23,7 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	iwinfo
 
-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)
+DEFAULT_GLUON_RELEASE := 0.3+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)