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

[Backport legacy] domains: add Donau-Ries domains #294

Merged
merged 2 commits into from
Nov 9, 2023
Merged

[Backport legacy] domains: add Donau-Ries domains #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8470cd3
domains: add ffdon/donau-ries domains
grische Oct 31, 2023
b9a0290
domains: fix ffdon domains for Gluon pre-2022
grische Nov 8, 2023
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
82 changes: 82 additions & 0 deletions domains/ffdon_mitte.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
domain_names = {
ffdon_mitte = 'Freifunk Donau-Ries - Mitte',
ffdon_wemding = 'Freifunk Donau-Ries Wemding',
ffdon_monheim = 'Freifunk Donau-Ries Monheim',
ffdon_harburg = 'Freifunk Donau-Ries Harburg',
},
hide_domain = true, -- temporary. for testing change with: gluon-switch-domain 'ffdon_mitte'
-- hide_domain = { 'ffdon_wemding', 'ffdon_monheim', 'ffdon_harburg' } -- legacy domains, only used for migration
domain_seed = 'b9d58035a5a2256627a813ee9d10ebdbf53bbac562fddf240c28ed2becf4c0ec',

prefix4 = '10.86.128.0/21',
prefix6 = 'fd62:f45c:4d09:190::/64',

extra_prefixes6 = {
'2001:678:e68:190::/64',
'2001:678:ed0:190::/64',
},

wifi24 = {
ap = {
ssid = 'Freifunk-Donau-Ries',
},
mesh = {
id = 'ffdon-mitte-mesh',
},
},

wifi5 = {
ap = {
ssid = 'Freifunk-Donau-Ries',
},
mesh = {
id = 'ffdon-mitte-mesh',
},
},

dns = {
servers = {
'2001:678:e68:ff00::3',
'2001:678:e68:ff00::4',
},
},

next_node = {
name = { 'next.node' },
ip4 = '10.86.128.1',
ip6 = 'fd62:f45c:4d09:190::1',
},

mesh_vpn = {
mtu = 1406,
wireguard = {
enabled = 'true',
iface = 'wg_mesh_vpn',
limit = '1', -- actually unused
broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
peers = {
{
publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=',
endpoint ='gw04.ext.ffmuc.net:40190',
link_address='fe80::27c:16ff:fec0:6c74',
},
{
publickey ='igyqOmWiz4EZxPG8ZzU537MnHhaqlwfa7HarB3KmnEg=',
endpoint ='gw05.ext.ffmuc.net:40190',
link_address='fe80::281:8eff:fef0:73aa',
},
{
publickey ='pkRaUOoLuuHnUt9BEGeKrhF3OMYBPecc0iYkika6uhE=',
endpoint ='gw06.ext.ffmuc.net:40190',
link_address='fe80::2a2:e4ff:fef9:2269',
},
{
publickey ='PcKkakZcTEx3LKh+G06Opb8/esg08aWK33A5/Ff1YXE=',
endpoint ='gw07.ext.ffmuc.net:40190',
link_address='fe80::23b:d2ff:fe95:967f',
},
},
},
},
}
81 changes: 81 additions & 0 deletions domains/ffdon_nordwest.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
domain_names = {
ffdon_nordwest = 'Freifunk Donau-Ries - Nordwest',
ffdon_noerdlingen = 'Freifunk Donau-Ries Noerdlingen',
ffdon_oettingen = 'Freifunk Donau-Ries Oettingen',
},
hide_domain = true, -- temporary. for testing change with: gluon-switch-domain 'ffdon_nordwest'
-- hide_domain = { 'ffdon_noerdlingen', 'ffdon_oettingen' } -- legacy domains, only used for migration
domain_seed = '0cd943171cdc3afa3546a01dbbb48a6386fc871251f4e55f785e23bdbe3b31c4',

prefix4 = '10.86.136.0/21',
prefix6 = 'fd62:f45c:4d09:191::/64',

extra_prefixes6 = {
'2001:678:e68:191::/64',
'2001:678:ed0:191::/64',
},

wifi24 = {
ap = {
ssid = 'Freifunk-Donau-Ries',
},
mesh = {
id = 'ffdon-nordwest-mesh',
},
},

wifi5 = {
ap = {
ssid = 'Freifunk-Donau-Ries',
},
mesh = {
id = 'ffdon-nordwest-mesh',
},
},

dns = {
servers = {
'2001:678:e68:ff00::3',
'2001:678:e68:ff00::4',
},
},

next_node = {
name = { 'next.node' },
ip4 = '10.86.136.1',
ip6 = 'fd62:f45c:4d09:191::1',
},

mesh_vpn = {
mtu = 1406,
wireguard = {
enabled = 'true',
iface = 'wg_mesh_vpn',
limit = '1', -- actually unused
broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
peers = {
{
publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=',
endpoint ='gw04.ext.ffmuc.net:40191',
link_address='fe80::27c:16ff:fec0:6c74',
},
{
publickey ='igyqOmWiz4EZxPG8ZzU537MnHhaqlwfa7HarB3KmnEg=',
endpoint ='gw05.ext.ffmuc.net:40191',
link_address='fe80::281:8eff:fef0:73aa',
},
{
publickey ='pkRaUOoLuuHnUt9BEGeKrhF3OMYBPecc0iYkika6uhE=',
endpoint ='gw06.ext.ffmuc.net:40191',
link_address='fe80::2a2:e4ff:fef9:2269',
},
{
publickey ='PcKkakZcTEx3LKh+G06Opb8/esg08aWK33A5/Ff1YXE=',
endpoint ='gw07.ext.ffmuc.net:40191',
link_address='fe80::23b:d2ff:fe95:967f',
},
},
},
},
}
83 changes: 83 additions & 0 deletions domains/ffdon_sued.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
domain_names = {
ffdon_sued = 'Freifunk Donau-Ries - Süd',
ffdon_donauwoerth = 'Freifunk Donau-Ries Donauwoerth',
ffdon_baeumenheim = 'Freifunk Donau-Ries Baeumenheim',
ffdon_rain = 'Freifunk Donau-Ries Rain',
ffdon_umland = 'Freifunk Donau-Ries Umland',
},
hide_domain = true, -- temporary. for testing change with: gluon-switch-domain 'ffdon_sued'
-- hide_domain = { 'ffdon_donauwoerth', 'ffdon_baeumenheim', 'ffdon_rain', 'ffdon_umland' } -- legacy domains, only used for migration
domain_seed = '022be6c32c6ccd16744fbee39354451551c2a21b10b3331082e527d7a7705a7f',

prefix4 = '10.86.144.0/21',
prefix6 = 'fd62:f45c:4d09:192::/64',

extra_prefixes6 = {
'2001:678:e68:192::/64',
'2001:678:ed0:192::/64',
},

wifi24 = {
ap = {
ssid = 'Freifunk-Donau-Ries',
},
mesh = {
id = 'ffdon-sued-mesh',
},
},

wifi5 = {
ap = {
ssid = 'Freifunk-Donau-Ries',
},
mesh = {
id = 'ffdon-sued-mesh',
},
},

dns = {
servers = {
'2001:678:e68:ff00::3',
'2001:678:e68:ff00::4',
},
},

next_node = {
name = { 'next.node' },
ip4 = '10.86.144.1',
ip6 = 'fd62:f45c:4d09:192::1',
},

mesh_vpn = {
mtu = 1406,
wireguard = {
enabled = 'true',
iface = 'wg_mesh_vpn',
limit = '1', -- actually unused
broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
peers = {
{
publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=',
endpoint ='gw04.ext.ffmuc.net:40192',
link_address='fe80::27c:16ff:fec0:6c74',
},
{
publickey ='igyqOmWiz4EZxPG8ZzU537MnHhaqlwfa7HarB3KmnEg=',
endpoint ='gw05.ext.ffmuc.net:40192',
link_address='fe80::281:8eff:fef0:73aa',
},
{
publickey ='pkRaUOoLuuHnUt9BEGeKrhF3OMYBPecc0iYkika6uhE=',
endpoint ='gw06.ext.ffmuc.net:40192',
link_address='fe80::2a2:e4ff:fef9:2269',
},
{
publickey ='PcKkakZcTEx3LKh+G06Opb8/esg08aWK33A5/Ff1YXE=',
endpoint ='gw07.ext.ffmuc.net:40192',
link_address='fe80::23b:d2ff:fe95:967f',
},
},
},
},
}