sprinterfreak/site-ffrgb-dev
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Config changes for upcoming domain-select

Browse Source
This commit is contained in:
Bastian 2018-01-16 20:59:50 +01:00
parent 8737663307
commit abb7ed3eaa
3 changed files with 116 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
domains/ffrgb.conf Normal file
View File

@ -0,0 +1,105 @@
{
domain_name = 'Legacy',
domain_code = 'ffrgb',
domain_seed = 'c8951e3a104d55543da98ee732468ea121878e77c6d18cbcbefb5409c292601a',
opkg = {
--[[ old
openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
]]
lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
},
prefix4 = '10.90.0.0/19',
prefix6 = 'fdef:f00f:1337:cafe::/64',
ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
wifi24 = {
channel = 1,
ap = {
ssid = 'regensburg.freifunk.net',
},
ibss = {
ssid = 'mesh.ffrgb',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'regensburg.freifunk.net',
},
ibss = {
ssid = 'mesh.ffrgb',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
}
},
dns = {
cacheentries = 500,
servers = { 'fdef:f00f:1337:cafe::11', },
},
next_node = {
ip4 = '10.90.0.1',
ip6 = 'fdef:f00f:1337:cafe::1',
mac = '16:41:95:40:f7:dd',
},
mesh_vpn = {
mtu = 1426,
fastd = {
groups = {
backbone = {
limit = 2,
peers = {
gw01 = { --[[ sven ]]
key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
remotes = {
'ipv4 "78.47.168.108" port 10000',
},
},
gw02 = { --[[ alamar ]]
key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
remotes = {
'ipv4 "185.53.218.23" port 10000',
},
},
gw04 = { --[[ mephisto ]]
key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
remotes = {
'ipv4 "213.166.225.5" port 10000',
},
},
},
},
},
},
bandwidth_limit = {
enabled = false,
ingress = 12000,
egress = 1200,
},
},
autoupdater = {
enabled = 1,
branches = {
stable = {
mirrors = {
'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/',
},
},
experimental = {
mirrors = {
'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/',
},
},
},
},
}
-- vim: set ft=lua:ts=2:sw=2:et

43
domains/ffrgb_cty.conf
View File

@ -1,8 +1,7 @@
{
hostname_prefix = '',
site_name = 'Freifunk Regensburg Stadt',
site_code = 'ffrgb_cty',
site_seed = '1124de9b0fe2dde424c8a4c481816b5899e6d1b4b4cf72de42136c4f1f197c7a',
domain_name = 'City',
domain_code = 'ffrgb_cty',
domain_seed = '1124de9b0fe2dde424c8a4c481816b5899e6d1b4b4cf72de42136c4f1f197c7a',
opkg = {
--[[ old
@ -14,16 +13,9 @@
prefix4 = '10.90.32.0/19',
prefix6 = 'fdef:f10f:1337:cafe::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
mesh_on_wan = true,
regdom = 'DE',
wifi24 = {
supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
basic_rate = {6000, 9000, 18000, 36000, 54000},
channel = 1,
ap = {
ssid = 'regensburg.freifunk.net',
@ -48,7 +40,7 @@
},
dns = {
cacheentries = 5000,
cacheentries = 500,
servers = { 'fdef:f10f:1337:cafe::11', },
},
@ -61,8 +53,6 @@
mesh_vpn = {
mtu = 1280,
fastd = {
configurable = true,
methods = {'salsa2012+umac'},
groups = {
backbone = {
limit = 1,
@ -71,21 +61,21 @@
key = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd',
remotes = {
'ipv4 "gw11.ffrgb.net" port 10010',
'ipv4 "gw11.regensburg.freifunk.net" port 10010',
'ipv4 "gw11.ffrgb.net" port 10011',
'ipv4 "gw11.regensburg.freifunk.net" port 10011',
'ipv4 "gw11.ffrgb.net" port 10012',
'ipv4 "gw11.regensburg.freifunk.net" port 10010',
'ipv4 "gw11.regensburg.freifunk.net" port 10011',
'ipv4 "gw11.regensburg.freifunk.net" port 10012',
},
},
gwsec = { --[[ coldstandby ]]
key = '',
key = '0000000000000000000000000000000000000000000000000000000000000000',
remotes = {
'ipv4 "gw12.ffrgb.net" port 10010',
'ipv4 "gw12.regensburg.freifunk.net" port 10010',
'ipv4 "gw12.ffrgb.net" port 10011',
'ipv4 "gw12.regensburg.freifunk.net" port 10011',
'ipv4 "gw12.ffrgb.net" port 10012',
'ipv4 "gw12.regensburg.freifunk.net" port 10010',
'ipv4 "gw12.regensburg.freifunk.net" port 10011',
'ipv4 "gw12.regensburg.freifunk.net" port 10012',
},
},
@ -102,31 +92,16 @@
autoupdater = {
enabled = 1,
branch = 'stable',
branches = {
stable = {
name = 'stable',
mirrors = {
'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/',
},
good_signatures = 1,
pubkeys = {
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
'130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
},
},
experimental = {
name = 'experimental',
mirrors = {
'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/',
},
good_signatures = 1,
pubkeys = {
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
'130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
},
},
},
},

53
site.conf
View File

@ -2,7 +2,7 @@
hostname_prefix = '',
site_name = 'Freifunk Regensburg',
site_code = 'ffrgb',
site_seed = 'c8951e3a104d55543da98ee732468ea121878e77c6d18cbcbefb5409c292601a',
default_domain_code = 'ffrgb',
opkg = {
--[[ old
@ -11,10 +11,7 @@
lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
},
prefix4 = '10.90.0.0/19',
prefix6 = 'fdef:f00f:1337:cafe::/64',
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.ffrgb','2.ntp.services.ffrgb'},
mesh_on_wan = true,
@ -29,8 +26,6 @@
ssid = 'regensburg.freifunk.net',
},
ibss = {
ssid = 'mesh.ffrgb',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
},
},
@ -41,53 +36,15 @@
ssid = 'regensburg.freifunk.net',
},
ibss = {
ssid = 'mesh.ffrgb',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
}
},
dns = {
cacheentries = 5000,
servers = { 'fdef:f00f:1337:cafe::11', },
},
next_node = {
ip4 = '10.90.0.1',
ip6 = 'fdef:f00f:1337:cafe::1',
mac = '16:41:95:40:f7:dd',
},
mesh_vpn = {
mtu = 1426,
fastd = {
configurable = true,
methods = {'salsa2012+umac'},
groups = {
backbone = {
limit = 2,
peers = {
gw01 = { --[[ sven ]]
key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
remotes = {
'ipv4 "78.47.168.108" port 10000',
},
},
gw02 = { --[[ alamar ]]
key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
remotes = {
'ipv4 "185.53.218.23" port 10000',
},
},
gw04 = { --[[ mephisto ]]
key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
remotes = {
'ipv4 "213.166.225.5" port 10000',
},
},
},
},
},
},
bandwidth_limit = {
enabled = false,
@ -102,9 +59,6 @@
branches = {
stable = {
name = 'stable',
mirrors = {
'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/',
},
good_signatures = 1,
pubkeys = {
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
@ -114,9 +68,6 @@
},
experimental = {
name = 'experimental',
mirrors = {
'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/',
},
good_signatures = 1,
pubkeys = {
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto