Merge branch 'experimental'

Conflicts:
	CHANGELOG.md
	site.conf

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Freifunk München Firmware Changelog
 
+## v2015.2
+ - Switched to batman-adv compat version 15
+ - Changed channel to 6 with HT20 on 2.4GHz
+
 ## v2015.1
  - Updated to Gluon 2014.4 release
  - Autoupdater

Makefile

@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := git://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2014.4
+GLUON_GIT_REF := 754e4af1d738ebb84fd63bd98d6b606613202898
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 

site.conf

@@ -1,73 +1,23 @@
---[[	
-	gluon site.conf example
-
-        This file contains the Munich freifunk site.conf which was adopted from the original freifunk suite used in Luebeck. 
-	There are comments added to most switches to explain the usage of gluon.
-
-	This is lua code now, not perl anymore.
-
-	Happy compiling!
-]]
-
 {
-	--[[	Community settings
+  hostname_prefix = '',
-	hostname_prefix:	Nodename prefix
-	freifunk-abcdef123456 (hex-part is generated from node's MAC address)
-	site_name:			Name of your community
-	site_code:			Shortcode of your community
-	]]
-
-	hostname_prefix = 'freifunk',
   site_name = 'Freifunk München',
   site_code = 'ffmuc',
   opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
 
-
-	--[[	General network settings
-	prefix4:			IPv4 range of your community
-	prefix6:			IPv6 range of your community
-		is also required for radvd  ]]
-
   prefix4 = '10.80.0.0/16',
   prefix6 = 'fdef:ffc0:4fff::/64',
 
-
-	--[[	NTP settings
-		Synchronize the time of the nodes
-		timezone: Timezone of your community
-		http://wiki.openwrt.org/doc/uci/system#time.zones
-		ntp_servers: List of NTP-Servers to query. You can use any public and/or your private NTP-Servers of your community.
-		http://www.pool.ntp.org/zone/de ]]
-
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
-	ntp_servers = {'1.ntp.services.ffm','3.ntp.services.ffm'},
+  ntp_servers = {'de.pool.ntp.org'},
-
-	--[[	Wireless settings
-		regdom: IEEE 802.11 Regulatory Domain
-		http://en.wikipedia.org/wiki/IEEE_802.11#Regulatory_domains_and_legal_compliance
-		wifi24: Wifi settings for 2.4 GHz frequency devices
-		wifi5: Wifi settings for 5 GHz frequency devices
-		sub
-		ssid: Wifi name shown to the user (We recommend %site_code%.freifunk.net)
-		channel: Wifi channel to use
-		htmode:	Specifies the channel width in 802.11n and 802.11ac mode, possible values are:
-						HT20 (single 20MHz channel),
-						HT40- (2x 20MHz channels, primary/control channel is upper, secondary channel is below)
-						HT40+ (2x 20MHz channels, primary/control channel is lower, secondary channel is above).
-						VHT20 / VHT40 / VHT80 / VHT160 (channel width in 802.11ac, extra channels are picked according to the specification)
-		http://wiki.openwrt.org/doc/uci/wireless#common.options (-> htmode)
-		mesh_ssid: SSID of the mesh-interface, an ugly SSID prevent clients from connecting (We recommend not to change this)
-		mesh_bssid: BSSID of the mesh-interface
-		mesh_mcast_rate: multicast rate of the mesh-interface ]]
 
   regdom = 'DE',
 
   wifi24 = {
     ssid = 'muenchen.freifunk.net',
-		channel = 1,
+    channel = 6,
-		htmode = 'HT40+',
+    htmode = 'HT20',
     mesh_ssid = 'mesh.ffmuc',
-		mesh_bssid = '02:0E:8E:1E:61:17',  --[[ from https://muenchen.freifunk.net/wiki/Knoten#B.A.T.M.A.N._Advanced ]]
+    mesh_bssid = '02:0E:8E:1E:61:17',
     mesh_mcast_rate = 12000,
   },
 
@@ -80,72 +30,52 @@
     mesh_mcast_rate = 12000,
   },
 
-
-	--[[	Next-Node
-		next_node: Howto reach the node you are currently connected to
-		The node will always be reachable at that address, and it's the same on all nodes. Because next_node packets are redirected within the node itself, there will be no conflicts.
-		sub
-		ip4: IPv4 Address to use
-		ip6: IPv6 Address to use
-		mac: MAC Address to use
-		(TODO: What is the purpose of this MAC-Address here?) ]]
-
   next_node = {
     ip4 = '10.80.0.1',
     ip6 = 'fdef:ffc0:4fff::1',
     mac = '16:41:95:40:f7:dc',
   },
 
-
-	--[[	Gateway settings
-		fastd_mesh_vpn:	fastd vpn settings
-		https://projects.universe-factory.net/projects/fastd/wiki/User_manual
-		sub
-		methods: encryption algorithms to use
-		https://projects.universe-factory.net/projects/fastd/wiki/Methods
-		When multiple method statements are given, the first one has the highest preference.
-		mtu: package size
-		backbone: fastd vpn gateways of your community
-		sub
-		limit: Number of gateways each node connects to
-		On startup, each node tries to connect to every gateway, and then chooses the number of 'limit' fastest gateways it could reach
-		peers: Gateways
-		sub sub
-		key: public fastd key of your gateway
-		https://github.com/tcatm/ecdsautils
-		remotes: List of fastd configuration strings to connect to your gateway server ]]
-
-
   fastd_mesh_vpn = {
-                methods = {'salsa2012+umac', 'salsa2012+gmac'},
+    methods = {'salsa2012+umac'},
     mtu = 1426,
     backbone = {
       limit = 2,
       peers = {
-                                 vpn_gw01 = {   --[[ VPN Server von Ole (netcap) ]]
+        gw02 = {   --[[ mephisto ]]
-                                        key = '0ac59c349980993c99e74e1c5242c39cdd7282fbab0b9575b35762993df510f3',
+          key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0',
-                                        remotes = {'ipv4 "37.120.168.150" port 10000'},
+          remotes = {
-                                        },
+            '"gw02.ffmuc.net" port 10000',
-                                 vpn_gw04 = {   --[[ VPN Server von mephisto ]]
+            '"gw02.freifunk-muenchen.de" port 10000',
-                                        key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
-                                        remotes = {'ipv4 "213.166.225.3" port 10000'},
           },
         },
+        gwtest1 = {   
+          key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
+          remotes = { 
+            '"gwtest1.ffmuc.net" port 10000',
           },  
         },  
 
-       --[[	gluon autoupdater section 
+       gwtest2 = { 
-		a how-to can be found here: http://gluon.readthedocs.org/en/latest/features/autoupdater.html
+          key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
-		enable: 0, 1 
+          remotes = { 
-		branch: stable, beta, experimental
+            '"gwtest2.ffmuc.net" port 10000',
-		name: name of the branch
+          },  
-		mirrors: comma separated ipv6 based mirror-servers to access the firmware image
+        },  
-		good_signatures: number of at leased good signatures signed by the authors of the firmware
+
-		pubkeys: public keys of the authors of the firmware image ]]
+       gwtest3 = { 
+          key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
+          remotes = { 
+            '"gwtest3.ffmuc.net" port 10000',
+          },  
+        }  
+      },
+    },
+  },
 
   autoupdater = {
     enabled = 1,
-		branch = 'stable',
+    branch = 'experimental',
     branches = {
       stable = {
         name = 'stable',
@@ -158,7 +88,7 @@ autoupdater = {
         probability = 0.08,
         good_signatures = 2,
         pubkeys = {
-          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- Ole
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
         },
@@ -171,8 +101,6 @@ autoupdater = {
         probability = 0.1,
         good_signatures = 1,
         pubkeys = {
-          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- Ole
-          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
 				},
 			},

site.mk

@@ -1,5 +1,5 @@
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-14 \
+	gluon-mesh-batman-adv-15 \
 	gluon-alfred \
 	gluon-announced \
 	gluon-autoupdater \