Merge pull request #2 from freifunk-gluon/master

merge original repo

Readme.md

@@ -6,6 +6,7 @@ Other site.conf Repositories:
 
 * [Hamburg](https://github.com/freifunkhamburg/site-ffhh)
 * [Lübeck](https://github.com/freifunk-gluon/site-ffhl)
+* [Magdeburg](https://github.com/FreifunkMD/site-ffmd)
 * [Mainz](https://github.com/Freifunk-Mainz/site-ffmz)
 * Oldenburg: [gitphp](http://git.freifunk-ol.de/projects/ffol/gluon-siteconf.git) / [redmine](https://ticket.freifunk-ol.de/projects/siteconf-ffol/repository)
 * [Paderborn](https://git.c3pb.de/freifunk-pb/site-ffpb)

site.conf

@@ -13,7 +13,7 @@
 	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 (TODO: Is this the local DNS entry?)
+	site_code:			Shortcode of your community
 	]]
 	hostname_prefix = 'freifunk',
 	site_name = 'Freifunk Lübeck',
@@ -49,9 +49,9 @@
 	ssid:			Wifi name shown to the user
 	channel:		Wifi channel to use
 	htmode:
-	mesh_ssid:
-	mesh_bssid:
-	mesh_mcast_rate:
+	mesh_ssid:		SSID of the mesh-interface, an ugly SSID prevent clients from connecting
+	mesh_bssid:		BSSID of the mesh-interface
+	mesh_mcast_rate:	multicast rate of the mesh-interface
 		(TODO: fill me)
 	]]
 	regdom = 'DE',
@@ -76,8 +76,7 @@
 
 
 	--[[	Next-Node
-	next_node:		Howto reach the the node you are currently connected to
-		(TODO: Is this really the use of it? Which Interfaces are used?)
+	next_node:		Howto reach the node you are currently connected to
 		sub
 	ip4:			IPv4 Address to use
 	ip6:			IPv6 Address to use
@@ -185,14 +184,13 @@
 	},
 
 
-	--[[	Simple TC settings
-		(TODO: What is this?)
+	--[[	Simple TC settings to limit the vpn-uplink
 	mesh_vpn:
 		sub
-	ifname:
-	enabled:
-	limit_egress:
-	limit_ingress:
+	ifname:		name of the interface/bridge
+	enabled:	default-value
+	limit_egress:	default-value
+	limit_ingress:	default-value
 	]]
 	simple_tc = {
 		mesh_vpn = {
@@ -206,7 +204,7 @@
 
 	--[[	Config Mode settings
 		Text shown on local website on node. you can use html here.
-	msg_welcome:	Welcome message shown at first startup
+	msg_welcome:		Welcome message shown at first startup
 	msg_pubkey:		Instructions for the user how your community handles the key exchange
 		only shown if VPN setting is selected
 	msg_reboot:		Message shown when configuration is finished while the node is rebooting.