Merge pull request #2 from freifunk-gluon/master

merge original repo
This commit is contained in:
Marc
2014-06-07 18:25:43 +02:00
2 changed files with 12 additions and 13 deletions

View File

@@ -6,6 +6,7 @@ Other site.conf Repositories:
* [Hamburg](https://github.com/freifunkhamburg/site-ffhh) * [Hamburg](https://github.com/freifunkhamburg/site-ffhh)
* [Lübeck](https://github.com/freifunk-gluon/site-ffhl) * [Lübeck](https://github.com/freifunk-gluon/site-ffhl)
* [Magdeburg](https://github.com/FreifunkMD/site-ffmd)
* [Mainz](https://github.com/Freifunk-Mainz/site-ffmz) * [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) * 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) * [Paderborn](https://git.c3pb.de/freifunk-pb/site-ffpb)

View File

@@ -13,7 +13,7 @@
hostname_prefix: Nodename prefix hostname_prefix: Nodename prefix
freifunk-abcdef123456 (hex-part is generated from node's MAC address) freifunk-abcdef123456 (hex-part is generated from node's MAC address)
site_name: Name of your community 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', hostname_prefix = 'freifunk',
site_name = 'Freifunk Lübeck', site_name = 'Freifunk Lübeck',
@@ -49,9 +49,9 @@
ssid: Wifi name shown to the user ssid: Wifi name shown to the user
channel: Wifi channel to use channel: Wifi channel to use
htmode: htmode:
mesh_ssid: mesh_ssid: SSID of the mesh-interface, an ugly SSID prevent clients from connecting
mesh_bssid: mesh_bssid: BSSID of the mesh-interface
mesh_mcast_rate: mesh_mcast_rate: multicast rate of the mesh-interface
(TODO: fill me) (TODO: fill me)
]] ]]
regdom = 'DE', regdom = 'DE',
@@ -76,8 +76,7 @@
--[[ Next-Node --[[ Next-Node
next_node: Howto reach the the node you are currently connected to next_node: Howto reach the node you are currently connected to
(TODO: Is this really the use of it? Which Interfaces are used?)
sub sub
ip4: IPv4 Address to use ip4: IPv4 Address to use
ip6: IPv6 Address to use ip6: IPv6 Address to use
@@ -185,14 +184,13 @@
}, },
--[[ Simple TC settings --[[ Simple TC settings to limit the vpn-uplink
(TODO: What is this?)
mesh_vpn: mesh_vpn:
sub sub
ifname: ifname: name of the interface/bridge
enabled: enabled: default-value
limit_egress: limit_egress: default-value
limit_ingress: limit_ingress: default-value
]] ]]
simple_tc = { simple_tc = {
mesh_vpn = { mesh_vpn = {