Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add vpn6 and minor fixes v2021.1.2.1 #48

Merged
merged 4 commits into from
Mar 10, 2024
Merged

Add vpn6 and minor fixes v2021.1.2.1 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7960591
Use spaces instead of tabs/spaces mix in conf files
bobidle Mar 10, 2024
16baa38
ffil: switch wifi24 channel to 1
bobidle Mar 10, 2024
1917e6b
Add vpn6
bobidle Mar 10, 2024
02fb743
Use unique domain seed for ffen, ffthw and ffwsee
bobidle Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 64 additions & 62 deletions domains/ffef_v1.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,74 @@
{
domain_code='ffef_v1',
domain_names={
ffef_v1='Freifunk Erfurt'
},
domain_code = 'ffef_v1',
domain_names = {
ffef_v1 = 'Freifunk Erfurt'
},

-- more domain specific config follows here
-- needed since v2018
-- 32 byte random data in hexadecimal encoding
-- This data must be unique among all sites and domains!
-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
domain_seed = '394bf993cd0fbb63a9bc834207f36cc99df532c0e76d88bd6505642fcbe3ffcf',
-- 32 byte random data in hexadecimal encoding
-- This data must be unique among all sites and domains!
-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
domain_seed = '394bf993cd0fbb63a9bc834207f36cc99df532c0e76d88bd6505642fcbe3ffcf',

-- more domain specific config follows here
prefix4 = '10.99.0.0/18',
prefix6 = 'fd0a:d928:b30d:4::/64',
-- more domain specific config follows here
prefix4 = '10.99.0.0/18',
prefix6 = 'fd0a:d928:b30d:4::/64',

wifi24 = {
channel = 1,
ap = {
ssid = 'Freifunk Erfurt',
},
mesh = {
id = 'mesh.erfurt.freifunk.net',
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'Freifunk Erfurt (5GHz)',
},
mesh = {
id = 'mesh.erfurt.freifunk.net',
mcast_rate = 12000,
},
},
wifi24 = {
channel = 1,
ap = {
ssid = 'Freifunk Erfurt',
},
mesh = {
id = 'mesh.erfurt.freifunk.net',
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'Freifunk Erfurt (5GHz)',
},
mesh = {
id = 'mesh.erfurt.freifunk.net',
mcast_rate = 12000,
},
},

mesh = {
vxlan = false,
batman_adv = {
gw_sel_class = 2500,
routing_algo = 'BATMAN_IV',
},
},
mesh = {
vxlan = false,
batman_adv = {
gw_sel_class = 2500,
routing_algo = 'BATMAN_IV',
},
},

mesh_vpn = {
mesh_vpn = {

mtu = 1426,
mtu = 1426,

fastd = {
methods = {'null+salsa2012+umac'},
groups = {
backbone = {
limit = 1,
peers = {
vpn5 = {
key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
},
},
},
},
},
},
fastd = {
methods = {'null+salsa2012+umac'},
groups = {
backbone = {
limit = 1,
peers = {
vpn5 = {
key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
},
vpn6 = {
key = '643209311edccd45058f470402faa0abf4020e36c0024f0b9c8b0740c97cd69c',
remotes = {'ipv4 "vpn6.erfurt.freifunk.net" port 1234'},
}
},
},
},
},
},

next_node = {
ip4 = '10.99.0.1',
ip6 = 'fd0a:d928:b30d:4::1',
mac = 'ca:ff:ee:ba:be:01',
},
next_node = {
ip4 = '10.99.0.1',
ip6 = 'fd0a:d928:b30d:4::1',
mac = 'ca:ff:ee:ba:be:01',
},
}
127 changes: 65 additions & 62 deletions domains/ffen_v1.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,71 +1,74 @@
{
domain_code = 'ffen_v1',
domain_names={
ffen_v1='Freifunk EA-WAK',
},

-- needed since v2018
-- 32 byte random data in hexadecimal encoding
-- This data must be unique among all sites and domains!
-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
domain_seed = '394bf993cd0fbb63a9bc834207f36cc99df532c0e76d88bd6505642fcbe3ffcf',
domain_code = 'ffen_v1',
domain_names = {
ffen_v1 = 'Freifunk EA-WAK',
},

-- more domain specific config follows here
prefix4 = '10.99.0.0/18',
prefix6 = 'fd0a:d928:b30d:4::/64',
-- 32 byte random data in hexadecimal encoding
-- This data must be unique among all sites and domains!
-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
domain_seed = '9c0c83ec4e7037ff2c691856011eb9e0ee976a1f267a7393937f087782a7c70b',

wifi24 = {
channel = 1,
ap = {
ssid = 'Freifunk EA-WAK',
},
mesh = {
id = 'mesh.ffea_wak.freifunk.net',
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'Freifunk EA-WAK (5GHz)',
},
mesh = {
id = 'mesh.ffea_wak.freifunk.net',
mcast_rate = 12000,
},
},
-- more domain specific config follows here
prefix4 = '10.99.0.0/18',
prefix6 = 'fd0a:d928:b30d:4::/64',

mesh = {
vxlan = false,
batman_adv = {
gw_sel_class = 2500,
routing_algo = 'BATMAN_IV',
},
},
wifi24 = {
channel = 1,
ap = {
ssid = 'Freifunk EA-WAK',
},
mesh = {
id = 'mesh.ffea_wak.freifunk.net',
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'Freifunk EA-WAK (5GHz)',
},
mesh = {
id = 'mesh.ffea_wak.freifunk.net',
mcast_rate = 12000,
},
},

mesh_vpn = {
mesh = {
vxlan = false,
batman_adv = {
gw_sel_class = 2500,
routing_algo = 'BATMAN_IV',
},
},

mtu = 1426,
mesh_vpn = {

fastd = {
methods = {'null+salsa2012+umac'},
groups = {
backbone = {
limit = 1,
peers = {
vpn5 = {
key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
},
},
},
},
},
},
mtu = 1426,

next_node = {
ip4 = '10.99.0.1',
ip6 = 'fd0a:d928:b30d:4::1',
mac = 'ca:ff:ee:ba:be:01',
},
fastd = {
methods = {'null+salsa2012+umac'},
groups = {
backbone = {
limit = 1,
peers = {
vpn5 = {
key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
},
vpn6 = {
key = '643209311edccd45058f470402faa0abf4020e36c0024f0b9c8b0740c97cd69c',
remotes = {'ipv4 "vpn6.erfurt.freifunk.net" port 1234'},
}
},
},
},
},
},

next_node = {
ip4 = '10.99.0.1',
ip6 = 'fd0a:d928:b30d:4::1',
mac = 'ca:ff:ee:ba:be:01',
},
}
Loading
Loading