Merge pull request #1 from ffrgb/experimental
transition Experimental to Stable
This commit is contained in:
commit
5fd2729570
53
site.conf
53
site.conf
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
hostname_prefix = 'freifunk',
|
hostname_prefix = 'freifunk',
|
||||||
site_name = 'Freifunk Regensburg',
|
site_name = 'Freifunk Regensburg',
|
||||||
site_code = 'ffrgb-bat14',
|
site_code = 'ffrgb-bat15',
|
||||||
opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
|
opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
|
||||||
|
|
||||||
|
|
||||||
@ -28,8 +28,8 @@
|
|||||||
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/16',
|
prefix4 = '10.90.0.0/16',
|
||||||
prefix6 = 'fdef:ffc0:4fff::/64',
|
prefix6 = 'fdef:f00f:1337:cafe/64',
|
||||||
|
|
||||||
|
|
||||||
--[[ NTP settings
|
--[[ NTP settings
|
||||||
@ -40,7 +40,7 @@
|
|||||||
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','3.ntp.services.ffm'},
|
ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
|
||||||
|
|
||||||
--[[ Wireless settings
|
--[[ Wireless settings
|
||||||
regdom: IEEE 802.11 Regulatory Domain
|
regdom: IEEE 802.11 Regulatory Domain
|
||||||
@ -66,7 +66,7 @@
|
|||||||
ssid = 'regensburg.freifunk.net',
|
ssid = 'regensburg.freifunk.net',
|
||||||
channel = 1,
|
channel = 1,
|
||||||
htmode = 'HT40+',
|
htmode = 'HT40+',
|
||||||
mesh_ssid = 'mesh.ffmuc',
|
mesh_ssid = 'mesh.ffrgb',
|
||||||
mesh_bssid = '02:0E:8E:1E:61:17', --[[ from https://muenchen.freifunk.net/wiki/Knoten#B.A.T.M.A.N._Advanced ]]
|
mesh_bssid = '02:0E:8E:1E:61:17', --[[ from https://muenchen.freifunk.net/wiki/Knoten#B.A.T.M.A.N._Advanced ]]
|
||||||
mesh_mcast_rate = 12000,
|
mesh_mcast_rate = 12000,
|
||||||
},
|
},
|
||||||
@ -75,7 +75,7 @@
|
|||||||
ssid = 'regensburg.freifunk.net',
|
ssid = 'regensburg.freifunk.net',
|
||||||
channel = 44,
|
channel = 44,
|
||||||
htmode = 'HT40+',
|
htmode = 'HT40+',
|
||||||
mesh_ssid = 'mesh.ffmuc',
|
mesh_ssid = 'mesh.ffrgb',
|
||||||
mesh_bssid = '02:0E:8E:1E:61:17',
|
mesh_bssid = '02:0E:8E:1E:61:17',
|
||||||
mesh_mcast_rate = 12000,
|
mesh_mcast_rate = 12000,
|
||||||
},
|
},
|
||||||
@ -91,9 +91,9 @@
|
|||||||
(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.90.0.1',
|
||||||
ip6 = 'fdef:ffc0:4fff::1',
|
ip6 = 'fdef:f00f:1337:cafe::1',
|
||||||
mac = '16:41:95:40:f7:dc',
|
mac = '16:41:95:40:f7:dd',
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
@ -122,13 +122,13 @@
|
|||||||
backbone = {
|
backbone = {
|
||||||
limit = 2,
|
limit = 2,
|
||||||
peers = {
|
peers = {
|
||||||
vpn_gw01 = { --[[ VPN Server von Ole (netcap) ]]
|
vpn_gw01 = { --[[ VPN Server von Sven (hetzner) ]]
|
||||||
key = '0ac59c349980993c99e74e1c5242c39cdd7282fbab0b9575b35762993df510f3',
|
key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
|
||||||
remotes = {'ipv4 "37.120.168.150" port 10000'},
|
remotes = {'ipv4 "78.47.168.108" port 10000'},
|
||||||
},
|
},
|
||||||
vpn_gw04 = { --[[ VPN Server von mephisto ]]
|
vpn_gw04 = { --[[ VPN Server von mephisto ]]
|
||||||
key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
|
key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
|
||||||
remotes = {'ipv4 "213.166.225.3" port 10000'},
|
remotes = {'ipv4 "213.166.225.5" port 10000'},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -150,7 +150,7 @@ autoupdater = {
|
|||||||
stable = {
|
stable = {
|
||||||
name = 'stable',
|
name = 'stable',
|
||||||
mirrors = {
|
mirrors = {
|
||||||
'http://[fdef:ffc0:4fff::14]/firmware/stable/sysupgrade/',
|
'http://[fdef:f00f:1337:cafe::11]/firmware/stable/sysupgrade/',
|
||||||
},
|
},
|
||||||
probability = 0.08,
|
probability = 0.08,
|
||||||
good_signatures = 2,
|
good_signatures = 2,
|
||||||
@ -162,7 +162,7 @@ autoupdater = {
|
|||||||
experimental = {
|
experimental = {
|
||||||
name = 'experimental',
|
name = 'experimental',
|
||||||
mirrors = {
|
mirrors = {
|
||||||
'http://[fdef:ffc0:4fff::14]/firmware/experimental/sysupgrade/',
|
'http://[fdef:f00f:1337:cafe::11]/firmware/experimental/sysupgrade/',
|
||||||
},
|
},
|
||||||
probability = 0.1,
|
probability = 0.1,
|
||||||
good_signatures = 1,
|
good_signatures = 1,
|
||||||
@ -217,29 +217,6 @@ 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 = [[
|
||||||
<p>
|
|
||||||
Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem
|
|
||||||
er auf den Servern des Münchener Freifunk-Projektes eingetragen wurde,
|
|
||||||
kann sich dein Knoten mit dem Münchner Mesh-VPN verbinden.
|
|
||||||
(Regensburg läuft derzeit im Münchener Mesh mit.)
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
Um deinen Knoten einzutragen, öffne in einem Browser deiner Wahl bitte <a href="http://key.freifunk-muenchen.de/?key=<%=pubkey%>&name=<%=hostname%>&mac=<%=sysconfig.primary_mac%>" target="_blank">Keyformular</a>, fülle das Formular aus und schicke es ab.
|
|
||||||
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p>Informationen für das Formular:
|
|
||||||
<ul>
|
|
||||||
<li>Knotenname: <%=hostname%></li>
|
|
||||||
<li>MAC-Adresse: <%=sysconfig.primary_mac%></li>
|
|
||||||
<li>Key: <%=pubkey%></li>
|
|
||||||
</ul>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
Sollte das Formular nicht verfügbar sein, sende bitte eine Mail an <a href="mailto:mail@dreessen.de">Ole</a> oder <a href="mailto:Frnk@bk.ru">frnk</a>.
|
|
||||||
</p>
|
|
||||||
]],
|
]],
|
||||||
msg_reboot = [[
|
msg_reboot = [[
|
||||||
<p>
|
<p>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user