krombel/site-ffmuc
1
0
Fork 0
forked from remote/site-ffmuc
Code Issues 4 Pull Requests 1 Releases Wiki Activity

Merge pull request #7 from spookey/master

Browse Source 
moar of everything, part 2
This commit is contained in:
Nils Schneider
2014-06-19 12:23:36 +02:00
parent 7a80e90c3b 80c07ae320
commit e19c4ab301
3 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Readme.md
View File

@@ -1,13 +1,19 @@
# gluon site examples # gluon site-example
This is a commented version of Lübecks `site.conf` and `site.mk` (without **gluon-legacy** package and configuration). This is a commented version of Lübecks `site.conf` and `site.mk` (without **gluon-legacy** package and configuration).
Other site.conf Repositories: Feel free to open issues if something has changed or still is undocumented:
* [Hamburg](https://github.com/freifunkhamburg/site-ffhh) * [site-example GitHub Issues](https://github.com/freifunk-gluon/site-example/issues)
* [Lübeck](https://github.com/freifunk-gluon/site-ffhl)
* [Magdeburg](https://github.com/FreifunkMD/site-ffmd) Pull requests solving the issues are welcome.
* [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) ## site-ff*
* [Paderborn](https://git.c3pb.de/freifunk-pb/site-ffpb)
* [Greifswald](https://github.com/lorenzo-greifswald/site-ffhgw) * [site-ffhh](https://github.com/freifunkhamburg/site-ffhh) (Hamburg)
* [site-ffhgw](https://github.com/lorenzo-greifswald/site-ffhgw) (Greifswald)
* [site-ffhl](https://github.com/freifunk-gluon/site-ffhl) (Lübeck)
* [site-ffmd](https://github.com/FreifunkMD/site-ffmd) (Magdeburg)
* [site-ffmz](https://github.com/Freifunk-Mainz/site-ffmz) (Mainz)
* [siteconf-ffol](https://ticket.freifunk-ol.de/projects/siteconf-ffol/repository) (Oldenburg)
* [site-ffpb](https://git.c3pb.de/freifunk-pb/site-ffpb) (Paderborn)

34
site.conf
View File

@@ -45,14 +45,18 @@
http://en.wikipedia.org/wiki/IEEE_802.11#Regulatory_domains_and_legal_compliance http://en.wikipedia.org/wiki/IEEE_802.11#Regulatory_domains_and_legal_compliance
wifi24: Wifi settings for 2.4 GHz frequency devices wifi24: Wifi settings for 2.4 GHz frequency devices
wifi5: Wifi settings for 5 GHz frequency devices wifi5: Wifi settings for 5 GHz frequency devices
sub: sub
ssid: Wifi name shown to the user ssid: Wifi name shown to the user (We recommend %site_code%.freifunk.net)
channel: Wifi channel to use channel: Wifi channel to use
htmode: htmode: Specifies the channel width in 802.11n and 802.11ac mode, possible values are:
mesh_ssid: SSID of the mesh-interface, an ugly SSID prevent clients from connecting 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_bssid: BSSID of the mesh-interface
mesh_mcast_rate: multicast rate of the mesh-interface mesh_mcast_rate: multicast rate of the mesh-interface
(TODO: fill me)
]] ]]
regdom = 'DE', regdom = 'DE',
@@ -77,25 +81,27 @@
--[[ Next-Node --[[ Next-Node
next_node: Howto reach the node you are currently connected to 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 sub
ip4: IPv4 Address to use ip4: IPv4 Address to use
ip6: IPv6 Address to use ip6: IPv6 Address to use
mac: MAC Address to use mac: MAC Address to use
(TODO: Why is there a mac?) (TODO: What is the purpose of this MAC-Address here?)
]] ]]
next_node = { next_node = {
ip4 = '10.130.0.1', ip4 = '10.130.0.1',
ip6 = 'fdef:ffc0:3dd7::1', ip6 = 'fdef:ffc0:3dd7::1',
-- TODO why is there a mac ?
mac = '16:41:95:40:f7:dc', mac = '16:41:95:40:f7:dc',
}, },
--[[ Gateway settings --[[ Gateway settings
fastd_mesh_vpn: fastd vpn settings fastd_mesh_vpn: fastd vpn settings
https://projects.universe-factory.net/projects/fastd/wiki/User_manual
sub sub
methods: encryption algorithms to use methods: encryption algorithms to use
(TODO: What happens if you use multiple? Is this possible?) 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 mtu: package size
backbone: fastd vpn gateways of your community backbone: fastd vpn gateways of your community
sub sub
@@ -169,9 +175,7 @@
experimental = { experimental = {
-- DE: Name des "braches" wird beim erstellen von Images / update generiert -- DE: Name des "braches" wird beim erstellen von Images / update generiert
name = 'experimental', name = 'experimental',
-- DE: Update Server. Diest ist ein einfacher Webserver ohne spezielle Konfiguration
mirrors = {'http://1.updates.services.ffhl/experimental/sysupgrade'}, mirrors = {'http://1.updates.services.ffhl/experimental/sysupgrade'},
-- TODO was ist das ?
probability = 1.00, probability = 1.00,
good_signatures = 2, good_signatures = 2,
good_signatures = 1, good_signatures = 1,
@@ -184,7 +188,7 @@
}, },
--[[ Simple TC settings to limit the vpn-uplink --[[ Simple TC settings to limit the bandwidth of the vpn-uplink
mesh_vpn: mesh_vpn:
sub sub
ifname: name of the interface/bridge ifname: name of the interface/bridge
@@ -203,8 +207,8 @@
--[[ Config Mode settings --[[ Config Mode settings
Text shown on local website on node. you can use html here. Text shown on local website on node while in config mode (after initial flashing or after a long press and hold on the primary button and reboot). You can use html here.
msg_welcome: Welcome message shown at first startup msg_welcome: Welcome message shown at startup
msg_pubkey: Instructions for the user how your community handles the key exchange msg_pubkey: Instructions for the user how your community handles the key exchange
only shown if VPN setting is selected only shown if VPN setting is selected
msg_reboot: Message shown when configuration is finished while the node is rebooting. msg_reboot: Message shown when configuration is finished while the node is rebooting.
@@ -225,7 +229,7 @@ Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen
entsprechend aus und sende es ab. entsprechend aus und sende es ab.
]], ]],
msg_pubkey = [[ msg_pubkey = [[
Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem
er auf den Servern des Lübecker Freifunk-Projektes eingetragen wurde, er auf den Servern des Lübecker Freifunk-Projektes eingetragen wurde,
kann sich dein Knoten mit dem Lübecker Mesh-VPN zu verbinden. Bitte kann sich dein Knoten mit dem Lübecker Mesh-VPN zu verbinden. Bitte
schicke dazu diesen Schlüssel und den Namen deines Knotens schicke dazu diesen Schlüssel und den Namen deines Knotens
@@ -235,7 +239,7 @@ schicke dazu diesen Schlüssel und den Namen deines Knotens
msg_reboot = [[ msg_reboot = [[
<p> <p>
Dein Knoten startet gerade neu und wird anschließend versuchen, Dein Knoten startet gerade neu und wird anschließend versuchen,
sich anschließend mit anderen Freifunkknoten in seiner Nähe zu sich anschließend mit anderen Freifunk-Knoten in seiner Nähe zu
verbinden. Weitere Informationen zur verbinden. Weitere Informationen zur
Lübecker Freifunk-Community findest du auf Lübecker Freifunk-Community findest du auf
<a href="https://luebeck.freifunk.net/">unserer Webseite</a>. <a href="https://luebeck.freifunk.net/">unserer Webseite</a>.

12
site.mk
View File

@@ -1,6 +1,6 @@
## gluon site.mk makefile example ## gluon site.mk makefile example
## GLUON_SITE_PACKAGES ## GLUON_SITE_PACKAGES
# specify gluon/openwrt packages to include here # specify gluon/openwrt packages to include here
GLUON_SITE_PACKAGES := \ GLUON_SITE_PACKAGES := \
@@ -21,7 +21,7 @@ GLUON_SITE_PACKAGES := \
haveged haveged
## DEFAULT_GLUON_RELEASE ## DEFAULT_GLUON_RELEASE
# version string to use for images # version string to use for images
# gluon relies on # gluon relies on
# opkg compare-versions "$1" '>>' "$2" # opkg compare-versions "$1" '>>' "$2"
@@ -29,5 +29,13 @@ GLUON_SITE_PACKAGES := \
DEFAULT_GLUON_RELEASE := 0.4+0-exp$(shell date '+%Y%m%d') DEFAULT_GLUON_RELEASE := 0.4+0-exp$(shell date '+%Y%m%d')
## GLUON_RELEASE
# call make with custom GLUON_RELEASE flag, to use your own release version scheme.
# e.g.:
# $ make images GLUON_RELEASE=23.42+5
# would generate images named like this:
# gluon-ff%site_code%-23.42+5-%router_model%.bin
# Allow overriding the release number from the command line # Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)