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

Changes for new experimental test network

Browse Source
This commit is contained in:
Franz Pletz
2014-12-09 22:20:44 +01:00
parent c1d5f6e4c9
commit c3a7431eec
1 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
site.conf
View File

@@ -8,25 +8,25 @@
prefix6 = 'fdef:ffc0:4fff::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
ntp_servers = {'1.ntp.services.ffm','2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm'},
ntp_servers = {'de.pool.ntp.org','1.ntp.services.ffm','2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm'},
regdom = 'DE',
wifi24 = {
ssid = 'muenchen.freifunk.net',
ssid = 'test.muenchen.freifunk.net',
channel = 1,
htmode = 'HT40+',
mesh_ssid = 'mesh.ffmuc',
mesh_bssid = '02:0E:8E:1E:61:17',
mesh_ssid = 'test.mesh.ffmuc',
mesh_bssid = '02:0E:8E:1E:61:16',
mesh_mcast_rate = 12000,
},
wifi5 = {
ssid = 'muenchen.freifunk.net',
ssid = 'test.muenchen.freifunk.net',
channel = 44,
htmode = 'HT40+',
mesh_ssid = 'mesh.ffmuc',
mesh_bssid = '02:0E:8E:1E:61:17',
mesh_ssid = 'test.mesh.ffmuc',
mesh_bssid = '02:0E:8E:1E:61:16',
mesh_mcast_rate = 12000,
},
@@ -42,13 +42,35 @@
backbone = {
limit = 2,
peers = {
test_gw01 = { --[[ VPN Server von Ole (netcap) ]]
key = '6597ad3726901e9d2890dc69780a1b7a89a1b7fdec8b73ffdea7760a063bbc6d',
remotes = {'ipv4 "46.38.240.165" port 10000'},
test_gw05 = { --[[ VPN Server von christian ]]
key = '9cef3f9a70cab24f9c64007e07318b350795a98c65efb9b650ffc919ee463930',
remotes = {
'"gw05.ffmuc.net" port 10015',
'"gw05.freifunk-muenchen.de" port 10015',
},
},
test_gw02 = { --[[ VPN Server von Ole (netcup) ]]
test_gw06 = { --[[ VPN Server von lhampe ]]
key = 'a020ee412581656af896597c1f0402b478696923f7868450d22d5e8a59084efd',
remotes = {
'"gw06.ffmuc.net" port 10000',
'"gw06.freifunk-muenchen.de" port 10000',
},
},
test_gw07 = { --[[ VPN Server von Ole (netcup) ]]
key = '6597ad3726901e9d2890dc69780a1b7a89a1b7fdec8b73ffdea7760a063bbc6d',
remotes = {
'"gw07.ffmuc.net" port 10000',
'"gw07.freifunk-muenchen.de" port 10000',
'46.38.234.101 port 10000',
},
},
test_gw08 = { --[[ VPN Server von Ole (netcup) ]]
key = 'd5fc5b4bae145f153ea8c5d094244f371508552a1f2724f707ef1afbaa502cfa',
remotes = {'ipv4 "46.38.234.101" port 10000'},
remotes = {
'"gw08.ffmuc.net" port 10000',
'"gw08.freifunk-muenchen.de" port 10000',
'46.38.240.165 port 10000',
},
},
},
},
@@ -56,7 +78,7 @@
autoupdater = {
enabled = 1,
branch = 'stable',
branch = 'experimental',
branches = {
stable = {
name = 'stable',