From 9ad996a9877f44faf1ea5aef62f0466e687f8c35 Mon Sep 17 00:00:00 2001
From: Freifunk Community Prignitz <webmaster@freifunk-prignitz.de>
Date: Fri, 10 Feb 2017 08:42:15 +0100
Subject: [PATCH] =?UTF-8?q?Umstellung=20auf=20802.11s,=20neue=20Fastd-Schl?=
 =?UTF-8?q?=C3=BCssel,=20kleine=20optische=20Verbesserungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 site.conf | 71 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/site.conf b/site.conf
index ab30e93..620a55f 100644
--- a/site.conf
+++ b/site.conf
@@ -11,7 +11,7 @@
 	prefix4 = '10.15.192.0/20',
 	prefix6 = 'fde8:21c6:370b::/64',
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	ntp_servers = {'ntp.ffpr'},
+	ntp_servers = { 'ntp.ffpr' },
 	regdom = 'DE',
 	wifi24 = {
 		channel = 9,
@@ -19,55 +19,53 @@
 		ap = {
 			ssid = 'prignitz.freifunk.net'
 		},
-		ibss = {
-			ssid = '0a:00:ba:dc:ab:1e',
-			bssid = '0a:00:ba:dc:ab:1e',
+		mesh = {
+			id = 'ff-prignitz-mesh',
 			mcast_rate = 12000
-		},
+		}
 	},
 	wifi5 = {
 		channel = 40,
 		htmode = 'HT40+',
-		master = {
-			ssid = 'prignitz.freifunk.net',
-		},
-		ibss = {
-			ssid = '0a:00:ba:dc:ab:1e',
-			bssid = '0a:00:ba:dc:ab:1e',
-			mcast_rate = 12000,
+		ap = {
+			ssid = 'prignitz.freifunk.net'
 		},
+		mesh = {
+			id = 'ff-prignitz-mesh',
+			mcast_rate = 12000
+		}
 	},
 	next_node = {
 		ip4 = '10.15.192.1',
 		ip6 = 'fde8:21c6:370b::1',
-		mac = '16:41:95:40:f7:dc',
+		mac = '16:41:95:40:f7:dc'
 	},
 	fastd_mesh_vpn = {
-		methods = {'salsa2012+umac'},
+		methods = { 'salsa2012+umac' },
 		mtu = 1426,
 		groups = {
 			backbone = {
 				limit = 1,
 				peers = {
 					gate01 = {
-						key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d',
+						key = '1ea68435d6676d3cd26693f1775eed5113c909a9b3d373dd71e7dd925ab95278',
 						remotes = {
 							'ipv4 "gate01.freifunk-prignitz.de" port 10000'
 						},
 					},
 					gate02 = {
-						key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496',
+						key = '886380d6799e2c25f9b89739cab74b9294dec58372ecb7c3cf5bb8f07bd36227',
 						remotes = {
 							'ipv4 "gate02.freifunk-prignitz.de" port 10000'
 						},
-					},
-				},
-			},
+					}
+				}
+			}
 		},
 		bandwidth_limit = {
 			enabled = false,
-			limit_ingress = 3000,
-			limit_egress = 200,
+			limit_ingress = 4096,
+			limit_egress = 512
 		}
 	},
 	autoupdater = {
@@ -75,32 +73,32 @@
 		branches = {
 			stable = {
 				name = 'stable',
-				mirrors = {'http://updates.ffpr/stable/sysupgrade'},
+				mirrors = { 'http://updates.ffpr/stable/sysupgrade' },
 				good_signatures = 2,
 				pubkeys = {
 					'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
-					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
-				},
+					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f'  -- Thomas
+				}
 			},
 			beta = {
 				name = 'beta',
-				mirrors = {'http://updates.ffpr/beta/sysupgrade'},
+				mirrors = { 'http://updates.ffpr/beta/sysupgrade' },
 				good_signatures = 2,
 				pubkeys = {
 					'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
-					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
+					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f'  -- Thomas
 				},
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://updates.ffpr/experimental/sysupgrade'},
+				mirrors = { 'http://updates.ffpr/experimental/sysupgrade' },
 				good_signatures = 1,
 				pubkeys = {
 					'5197c6033a6d4d3d0521701345116f3ac18270b3f4c32ec7673e87b32107243b', -- Develop
-					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
-				},
-			},
-		},
+					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f'  -- Thomas
+				}
+			}
+		}
 	},
 	roles = {
 		default = 'node',
@@ -110,7 +108,12 @@
 			'mobile',
 			'offloader',
 			'service',
-			'test',
-		},
+			'test'
+		}
 	},
-}
\ No newline at end of file
+	config_mode = {
+		geo_location = {
+			show_altitude = false
+		}
+	}
+}