From efb6960d3efc4835f7b7d8eac422d6dd9378d2a0 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Mon, 30 Mar 2015 16:26:51 +0200 Subject: [PATCH] Remove ULA, use downloads... as update server direectly --- site.conf | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/site.conf b/site.conf index 15c25c7..1703084 100644 --- a/site.conf +++ b/site.conf @@ -3,19 +3,21 @@ site_code = 'ffhb', prefix4 = '10.196.0.0/17', - prefix6 = 'fd2f:5119:0f2c::/64', - - mesh_domains = { 'ffhb', '196.10.in-addr.arpa', 'c.2.f.0.9.1.1.5.f.2.d.f.ip6.arpa' }, + prefix6 = '2001:bf7:540::/64', 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', wifi24 = { ssid = 'bremen.freifunk.net', channel = 6, htmode = 'HT20', - mesh_ssid = 'mesh.ffhb', + mesh_ssid = 'mesh.ffhb.de', mesh_bssid = '32:06:1C:1F:B9:E8', mesh_mcast_rate = 6000, }, @@ -23,14 +25,14 @@ ssid = 'bremen.freifunk.net', channel = 44, htmode = 'HT40+', - mesh_ssid = 'mesh.ffhb', + mesh_ssid = 'mesh.ffhb.de', mesh_bssid = '32:06:1C:1F:B9:E8', mesh_mcast_rate = 6000, }, next_node = { ip4 = '10.196.0.127', - ip6 = 'fd2f:5119:f2c::127', + ip6 = '2001:bf7:540::127', mac = '16:41:95:40:f7:dc', }, @@ -62,9 +64,7 @@ nightly = { name = 'nightly', mirrors = { - 'http://[fd2f:5119:0f2c::1]/firmware/nightly/sysupgrade', - 'http://[fd2f:5119:0f2c::2]/firmware/nightly/sysupgrade', - 'http://[fd2f:5119:0f2c::3]/firmware/nightly/sysupgrade', + 'http://downloads.bremen.freifunk.net/firmware/nightly/sysupgrade', }, good_signatures = 1, pubkeys = { @@ -74,9 +74,7 @@ testing = { name = 'testing', mirrors = { - 'http://[fd2f:5119:0f2c::1]/firmware/testing/sysupgrade', - 'http://[fd2f:5119:0f2c::2]/firmware/testing/sysupgrade', - 'http://[fd2f:5119:0f2c::3]/firmware/testing/sysupgrade', + 'http://downloads.bremen.freifunk.net/firmware/nightly/sysupgrade', }, good_signatures = 1, pubkeys = { @@ -87,9 +85,7 @@ stable = { name = 'stable', mirrors = { - 'http://[fd2f:5119:0f2c::1]/firmware/stable/sysupgrade', - 'http://[fd2f:5119:0f2c::2]/firmware/stable/sysupgrade', - 'http://[fd2f:5119:0f2c::3]/firmware/stable/sysupgrade', + 'http://downloads.bremen.freifunk.net/firmware/nightly/sysupgrade', }, good_signatures = 2, pubkeys = {