From 325cb98cb2c6109d208d3c80cff7950a1cf9577d Mon Sep 17 00:00:00 2001 From: midzer Date: Wed, 10 Sep 2014 20:00:40 +0200 Subject: [PATCH] Moved from latest test setup build --- site.conf | 206 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 118 insertions(+), 88 deletions(-) diff --git a/site.conf b/site.conf index 7e85ba2..16b478d 100644 --- a/site.conf +++ b/site.conf @@ -1,7 +1,7 @@ --[[ gluon site.conf example - This file is loosely related to the original site.conf used in Lübeck. - There are comments added to most switches to explain the usage of gluon. + 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. @@ -10,54 +10,53 @@ { --[[ Community settings - 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: 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 = 'ffm', --[[ General network settings - prefix4: IPv4 range of your community - prefix6: IPv6 range of your community - is also required for radvd - ]] + prefix4: IPv4 range of your community + prefix6: IPv6 range of your community + is also required for radvd ]] + prefix4 = '10.80.0.0/20', 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 - ]] + 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'}, - --[[ 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 + 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 - ]] + 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 = { @@ -80,69 +79,99 @@ --[[ 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: 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', + 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 + 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 + 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 + 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 - ]] + 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+gmac'}, --[[geändert am 26.07. von Ole]] - mtu = 1426, - backbone = { - limit = 2, - peers = { - test = { + methods = {'salsa2012+gmac'}, + mtu = 1426, + backbone = { + limit = 2, + peers = { + vpn_gw01 = { --[[ VPN Server von frnk ]] key = 'fd0b9a4a2f5117b2cc187e80e3656b1da854dd1bcbc17680833cc6824b3c4101', remotes = {'ipv4 "46.149.18.17" port 1234'}, - - - - }, - }, - }, + }, + vpn_gw02 = { --[[ VPN Server von Ole (netcap) ]] + key = '0ac59c349980993c99e74e1c5242c39cdd7282fbab0b9575b35762993df510f3', + remotes = {'ipv4 "37.120.168.150" port 10000'}, + }, + }, + }, + }, + --[[ gluon autoupdater section + a how-to can be found here: http://gluon.readthedocs.org/en/latest/features/autoupdater.html + enable: 0, 1 + branch: stable, beta, experimental + 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 ]] + + autoupdater = { + enabled = 0, + branch = 'experimental', + branches = { + stable = { + name = 'stable', + mirrors = { + 'http://{fdca:ffee:babe:1::fec1}/firmware/stable/sysupgrade/', + 'http://{fdca:ffee:babe:1::fec2}/firmware/stable/sysupgrade/', + }, + probability = 0.08, + good_signatures = 2, + pubkeys = { + 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', -- someguy + 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', -- someother + }, + }, + }, }, --[[ Simple TC settings to limit the bandwidth of the vpn-uplink - mesh_vpn: + mesh_vpn: sub - ifname: name of the interface/bridge - enabled: default-value - limit_egress: default-value - limit_ingress: default-value - ]] + ifname: name of the interface/bridge + enabled: default-value + limit_egress: default-value + limit_ingress: default-value ]] + simple_tc = { mesh_vpn = { ifname = 'mesh-vpn', - enabled = 0, + enabled = false, limit_egress = 200, limit_ingress = 3000, }, @@ -151,23 +180,24 @@ --[[ Config Mode settings 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 startup - msg_pubkey: Instructions for the user how your community handles the key exchange + msg_welcome: Welcome message shown at 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. + msg_reboot: Message shown when configuration is finished while the node is rebooting. Variables Within the text given here you can use variables which are replaced when the respective website is delivered to the user. Variables must be used in the format <%=NAME%>. See msg_pubkey for an example. - hostname hostname of the node - pubkey fastd public key of the node - sysconfig.primary_mac the primary mac of the node, also found printed beneath the device - ... other sysconfig.* variables: config_ifname, lan_ifname, wan_ifname - ]] + hostname: hostname of the node + pubkey: fastd public key of the node + sysconfig.primary_mac the primary mac of the node, also found printed beneath the device + ... other sysconfig.* variables: config_ifname, lan_ifname, wan_ifname ]] + + config_mode = { msg_welcome = [[ -Willkommen zum Einrichtungsassistenten für deinen neuen Münchner +Willkommen zum Einrichtungsassistenten für deinen neuen Münchner Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen entsprechend aus und sende es ab. ]], @@ -177,7 +207,7 @@ er auf den Servern des Münchener Freifunk-Projektes eingetragen wurde, kann sich dein Knoten mit dem Münchner Mesh-VPN verbinden. Bitte schicke dazu diesen Schlüssel und den Namen deines Knotens (<%=hostname%>) an -keys@muenchen.freifunk.net. +Ole oder an frnk. ]], msg_reboot = [[