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

Moved from latest test setup build

Browse Source
This commit is contained in:
midzer
2014-09-10 20:00:40 +02:00
parent 9ededf07eb
commit 325cb98cb2
1 changed files with 118 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
site.conf
View File

@@ -1,6 +1,6 @@
--[[ gluon site.conf example --[[ gluon site.conf example
This file is loosely related to the original site.conf used in Lübeck. 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. There are comments added to most switches to explain the usage of gluon.
This is lua code now, not perl anymore. This is lua code now, not perl anymore.
@@ -13,8 +13,8 @@
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 site_code: Shortcode of your community ]]
]]
hostname_prefix = 'freifunk', hostname_prefix = 'freifunk',
site_name = 'Freifunk München', site_name = 'Freifunk München',
site_code = 'ffm', site_code = 'ffm',
@@ -23,8 +23,8 @@
--[[ General network settings --[[ General network settings
prefix4: IPv4 range of your community prefix4: IPv4 range of your community
prefix6: IPv6 range of your community prefix6: IPv6 range of your community
is also required for radvd is also required for radvd ]]
]]
prefix4 = '10.80.0.0/20', prefix4 = '10.80.0.0/20',
prefix6 = 'fdef:ffc0:4fff::/64', prefix6 = 'fdef:ffc0:4fff::/64',
@@ -34,12 +34,11 @@
timezone: Timezone of your community timezone: Timezone of your community
http://wiki.openwrt.org/doc/uci/system#time.zones 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. 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 http://www.pool.ntp.org/zone/de ]]
]]
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
ntp_servers = {'1.ntp.services.ffm'}, ntp_servers = {'1.ntp.services.ffm'},
--[[ Wireless settings --[[ Wireless settings
regdom: IEEE 802.11 Regulatory Domain regdom: IEEE 802.11 Regulatory Domain
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
@@ -56,8 +55,8 @@
http://wiki.openwrt.org/doc/uci/wireless#common.options (-> htmode) 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_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 ]]
]]
regdom = 'DE', regdom = 'DE',
wifi24 = { wifi24 = {
@@ -86,8 +85,8 @@
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: What is the purpose of this MAC-Address here?) (TODO: What is the purpose of this MAC-Address here?) ]]
]]
next_node = { next_node = {
ip4 = '10.80.0.1', ip4 = '10.80.0.1',
ip6 = 'fdef:ffc0:4fff::1', ip6 = 'fdef:ffc0:4fff::1',
@@ -111,24 +110,54 @@
sub sub sub sub
key: public fastd key of your gateway key: public fastd key of your gateway
https://github.com/tcatm/ecdsautils https://github.com/tcatm/ecdsautils
remotes: List of fastd configuration strings to connect to your gateway server remotes: List of fastd configuration strings to connect to your gateway server ]]
]]
fastd_mesh_vpn = { fastd_mesh_vpn = {
methods = {'salsa2012+gmac'}, --[[geändert am 26.07. von Ole]] methods = {'salsa2012+gmac'},
mtu = 1426, mtu = 1426,
backbone = { backbone = {
limit = 2, limit = 2,
peers = { peers = {
test = { vpn_gw01 = { --[[ VPN Server von frnk ]]
key = 'fd0b9a4a2f5117b2cc187e80e3656b1da854dd1bcbc17680833cc6824b3c4101', key = 'fd0b9a4a2f5117b2cc187e80e3656b1da854dd1bcbc17680833cc6824b3c4101',
remotes = {'ipv4 "46.149.18.17" port 1234'}, 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 --[[ Simple TC settings to limit the bandwidth of the vpn-uplink
@@ -137,12 +166,12 @@
ifname: name of the interface/bridge ifname: name of the interface/bridge
enabled: default-value enabled: default-value
limit_egress: default-value limit_egress: default-value
limit_ingress: default-value limit_ingress: default-value ]]
]]
simple_tc = { simple_tc = {
mesh_vpn = { mesh_vpn = {
ifname = 'mesh-vpn', ifname = 'mesh-vpn',
enabled = 0, enabled = false,
limit_egress = 200, limit_egress = 200,
limit_ingress = 3000, limit_ingress = 3000,
}, },
@@ -160,14 +189,15 @@
Within the text given here you can use variables which are Within the text given here you can use variables which are
replaced when the respective website is delivered to the user. replaced when the respective website is delivered to the user.
Variables must be used in the format <%=NAME%>. See msg_pubkey for an example. Variables must be used in the format <%=NAME%>. See msg_pubkey for an example.
hostname hostname of the node hostname: hostname of the node
pubkey fastd public key 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 sysconfig.primary_mac the primary mac of the node, also found printed beneath the device
... other sysconfig.* variables: config_ifname, lan_ifname, wan_ifname ... other sysconfig.* variables: config_ifname, lan_ifname, wan_ifname ]]
]]
config_mode = { config_mode = {
msg_welcome = [[ 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 Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen
entsprechend aus und sende es ab. 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 kann sich dein Knoten mit dem Münchner Mesh-VPN verbinden. Bitte
schicke dazu diesen Schlüssel und den Namen deines Knotens schicke dazu diesen Schlüssel und den Namen deines Knotens
(<em><%=hostname%></em>) an (<em><%=hostname%></em>) an
<a href="mailto:keys@muenchen.freifunk.net">keys@muenchen.freifunk.net</a>. <a href="mailto:mail@dreessen.de">Ole</a> oder an <a href="mailto:Frnk@bk.ru">frnk</a>.
]], ]],
msg_reboot = [[ msg_reboot = [[
<p> <p>