freifunk/site-ffhh
0
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[CONFIG] split into second domain

Browse source
This commit is contained in:
Wiflix 2016-01-27 10:44:30 +01:00
parent 09df081aaa
commit 6900d4d002
1 changed files with 16 additions and 25 deletions

41
site.conf
View file

@ -1,11 +1,11 @@
{ {
hostname_prefix = 'GibMirEinenNamen', hostname_prefix = 'GibMirEinenNamen',
site_name = 'Freifunk Hamburg', site_name = 'Freifunk Hamburg 2nd Domain',
site_code = 'ffhh', site_code = 'ffhh2',
opkg_repo = 'http://opkg.services.ffhh/barrier_breaker/14.07/%S/packages', opkg_repo = 'http://opkg.services.ffhh/barrier_breaker/14.07/%S/packages',
prefix4 = '10.112.0.0/18', prefix4 = '10.112.192.0/18',
prefix6 = '2a03:2267::/64', prefix6 = '2a03:2267:192::/48',
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.ffhh','2.ntp.services.ffhh'}, ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'},
@ -13,26 +13,26 @@
wifi24 = { wifi24 = {
ssid = 'hamburg.freifunk.net', ssid = 'hamburg.freifunk.net',
channel = 1, channel = 5,
htmode = 'HT20', htmode = 'HT20',
mesh_ssid = 'f8:d1:11:87:52:2e', mesh_ssid = 'f8:d1:11:87:52:2d',
mesh_bssid = 'f8:d1:11:87:52:2e', mesh_bssid = 'f8:d1:11:87:52:2d',
mesh_mcast_rate = 12000, mesh_mcast_rate = 12000,
}, },
wifi5 = { wifi5 = {
ssid = 'hamburg.freifunk.net', ssid = 'hamburg.freifunk.net',
channel = 44, channel = 48,
htmode = 'HT40+', htmode = 'HT40+',
mesh_ssid = 'f8:d1:11:87:52:2e', mesh_ssid = 'f8:d1:11:87:52:2d',
mesh_bssid = 'f8:d1:11:87:52:2e', mesh_bssid = 'f8:d1:11:87:52:2d',
mesh_mcast_rate = 12000, mesh_mcast_rate = 12000,
}, },
next_node = { next_node = {
ip4 = '10.112.0.1', ip4 = '10.112.192.1',
ip6 = '2a03:2267::1', ip6 = '2a03:2267:192::1',
mac = '16:41:95:40:f7:dc', mac = '16:41:95:40:f7:dd',
}, },
fastd_mesh_vpn = { fastd_mesh_vpn = {
@ -84,8 +84,9 @@
}, },
}, },
-- TODO: add paths to 2nd domain's firmware
autoupdater = { autoupdater = {
branch = 'experimental', branch = 'beta',
branches = { branches = {
stable = { stable = {
name = 'stable', name = 'stable',
@ -128,15 +129,5 @@
limit_ingress = 8000, limit_ingress = 8000,
}, },
}, },
legacy = {
version_files = {'/etc/.freifunk_version_keep'},
old_files = {'/etc/config/config_mode', '/etc/config/freifunk'},
config_mode_configs = {'config_mode.@wizard{0}', 'freifunk.@wizard{0}'},
fastd_configs = {'mesh_vpn'},
mesh_ifname = 'freifunk',
tc_configs = {'freifunk.@bandwidth{0}'},
wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
},
} }