Remove ULA, use downloads... as update server direectly

This commit is contained in:
Jan-Philipp Litza 2015-03-30 16:26:51 +02:00
parent 6898559c51
commit c6b1d5335c
1 changed files with 12 additions and 16 deletions

View File

@ -4,19 +4,21 @@
site_code = 'ffhb', site_code = 'ffhb',
prefix4 = '10.196.0.0/17', prefix4 = '10.196.0.0/17',
prefix6 = 'fd2f:5119:0f2c::/64', prefix6 = '2001:bf7:540::/64',
mesh_domains = { 'ffhb', '196.10.in-addr.arpa', 'c.2.f.0.9.1.1.5.f.2.d.f.ip6.arpa' },
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = { '1.ntp.services.ffhb' }, ntp_servers = {
'1.ntp.services.bremen.freifunk.net',
'2.ntp.services.bremen.freifunk.net',
'3.ntp.services.bremen.freifunk.net',
},
regdom = 'DE', regdom = 'DE',
wifi24 = { wifi24 = {
ssid = 'bremen.freifunk.net', ssid = 'bremen.freifunk.net',
channel = 6, channel = 6,
htmode = 'HT20', htmode = 'HT20',
mesh_ssid = 'mesh.ffhb', mesh_ssid = 'mesh.ffhb.de',
mesh_bssid = '32:06:1C:1F:B9:E8', mesh_bssid = '32:06:1C:1F:B9:E8',
mesh_mcast_rate = 6000, mesh_mcast_rate = 6000,
}, },
@ -24,14 +26,14 @@
ssid = 'bremen.freifunk.net', ssid = 'bremen.freifunk.net',
channel = 44, channel = 44,
htmode = 'HT40+', htmode = 'HT40+',
mesh_ssid = 'mesh.ffhb', mesh_ssid = 'mesh.ffhb.de',
mesh_bssid = '32:06:1C:1F:B9:E8', mesh_bssid = '32:06:1C:1F:B9:E8',
mesh_mcast_rate = 6000, mesh_mcast_rate = 6000,
}, },
next_node = { next_node = {
ip4 = '10.196.0.127', ip4 = '10.196.0.127',
ip6 = 'fd2f:5119:f2c::127', ip6 = '2001:bf7:540::127',
mac = '16:41:95:40:f7:dc', mac = '16:41:95:40:f7:dc',
}, },
@ -63,9 +65,7 @@
nightly = { nightly = {
name = 'nightly', name = 'nightly',
mirrors = { mirrors = {
'http://[fd2f:5119:0f2c::1]/firmware/nightly/sysupgrade', 'http://downloads.bremen.freifunk.net/firmware/nightly/sysupgrade',
'http://[fd2f:5119:0f2c::2]/firmware/nightly/sysupgrade',
'http://[fd2f:5119:0f2c::3]/firmware/nightly/sysupgrade',
}, },
good_signatures = 1, good_signatures = 1,
pubkeys = { pubkeys = {
@ -75,9 +75,7 @@
testing = { testing = {
name = 'testing', name = 'testing',
mirrors = { mirrors = {
'http://[fd2f:5119:0f2c::1]/firmware/testing/sysupgrade', 'http://downloads.bremen.freifunk.net/firmware/nightly/sysupgrade',
'http://[fd2f:5119:0f2c::2]/firmware/testing/sysupgrade',
'http://[fd2f:5119:0f2c::3]/firmware/testing/sysupgrade',
}, },
good_signatures = 1, good_signatures = 1,
pubkeys = { pubkeys = {
@ -88,9 +86,7 @@
stable = { stable = {
name = 'stable', name = 'stable',
mirrors = { mirrors = {
'http://[fd2f:5119:0f2c::1]/firmware/stable/sysupgrade', 'http://downloads.bremen.freifunk.net/firmware/nightly/sysupgrade',
'http://[fd2f:5119:0f2c::2]/firmware/stable/sysupgrade',
'http://[fd2f:5119:0f2c::3]/firmware/stable/sysupgrade',
}, },
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {