Skip to content
This repository has been archived by the owner on Jun 20, 2020. It is now read-only.

Commit

Permalink
Merge pull request #49 from freifunk-ffm/next
Browse files Browse the repository at this point in the history 
v4.2-stable
  • Loading branch information
@margau
margau committed Jan 17, 2020
2 parents 38a5165 + e197ee3 commit a5e0888
Show file tree
Hide file tree
Showing 24 changed files with 1,906 additions and 7 deletions.
7 changes: 7 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
## Stable-Version der Frankfurter Freifunkfirmware

### v4.2-stable-0111
- Erstellt am 11.01.2019
- Multidomain-fähig
- Nodeseitige Vorbereitung des Domain Directors
- Wiedereinfügen des "Advanced" Config-Modes
- Basis ist Gluon [v2019.1.1](https://gluon.readthedocs.io/en/v2019.1.1/)

### v4.1-stable-0103
- Erstellt am 03.01.2019
- Nur noch ein BATMAN15-Netz
Expand Down
103 changes: 103 additions & 0 deletions domains/dom0.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{
domain_names = {
dom0 = 'Domain 0',
ffffm_default = 'Default'
},
domain_seed = 'a34fbba22be4d1673f3c5c8265f2462311ce6043ad5bad4759740e7a883392c9',
hide_domain = { 'dom0' },

prefix4 = '10.176.0.0/20',
prefix6 = 'fd06:8187:fbc0::/64',
extra_prefixes6 = { '2a06:8187:fbc0::/64' },

next_node = {
name = { 'nextnode.ffffm.net', 'nextnode' },
ip4 = '10.176.15.254',
ip6 = 'fd06:8187:fbc0::1:1',
mac = 'fa:ff:00:00:ff:ff',
},

wifi24 = {
ap = {
ssid = "ffm.freifunk.net",
},
mesh = {
id = 'ffffm-mesh-dom0',
},
},
wifi5 = {
ap = {
ssid = "ffm.freifunk.net",
},
mesh = {
id = 'ffffm-mesh-dom0',
},
},

mesh = {
vxlan = true,
batman_adv = {
routing_algo = 'BATMAN_IV',
},
},

mesh_vpn = {
fastd = {
groups = {
backbone = {
limit = 1,
peers = {
gw01 = {
key = 'e0852870545125d8b0688815a25397f69b5e675991b25caeb18770745de67805',
remotes = {
'"gw01.batman15.ffffm.net" port 10000',
},
},
gw02 = {
key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
remotes = {
'"gw02.batman15.ffffm.net" port 10000',
},
},
gw03 = {
key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
remotes = {
'"gw03.batman15.ffffm.net" port 10000',
},
},
gw04 = {
key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
remotes = {
'"gw04.batman15.ffffm.net" port 10000',
},
},
gw05 = {
key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
remotes = {
'"gw05.batman15.ffffm.net" port 10000',
},
},
gw06 = {
key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
remotes = {
'"gw06.batman15.ffffm.net" port 10000',
},
},
gw07 = {
key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
remotes = {
'"gw07.batman15.ffffm.net" port 10000',
},
},
gw08 = {
key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
remotes = {
'"gw08.batman15.ffffm.net" port 10000',
},
},
},
},
},
},
},
}
103 changes: 103 additions & 0 deletions domains/dom1.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{
domain_names = {
dom1 = 'Domain 1',
ffffm_event = 'Event'
},
domain_seed = '264272521fc93692f8ae285688e8f825b01a9376626df8600fead6e4fca9e5d6',
hide_domain = { 'dom1' },

prefix4 = '10.176.16.0/20',
prefix6 = 'fd06:8187:fbc1::/64',
extra_prefixes6 = { '2a06:8187:fbc1::/64' },

next_node = {
name = { 'nextnode.ffffm.net', 'nextnode' },
ip4 = '10.176.31.254',
ip6 = 'fd06:8187:fbc1::1:1',
mac = 'fa:ff:01:00:ff:ff',
},

wifi24 = {
ap = {
ssid = "ffm.freifunk.net",
},
mesh = {
id = 'ffffm-mesh-dom1',
},
},
wifi5 = {
ap = {
ssid = "ffm.freifunk.net",
},
mesh = {
id = 'ffffm-mesh-dom1',
},
},

mesh = {
vxlan = true,
batman_adv = {
routing_algo = 'BATMAN_IV',
},
},

mesh_vpn = {
fastd = {
groups = {
backbone = {
limit = 1,
peers = {
gw01 = {
key = 'e0852870545125d8b0688815a25397f69b5e675991b25caeb18770745de67805',
remotes = {
'"gw01.batman15.ffffm.net" port 10010',
},
},
gw02 = {
key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
remotes = {
'"gw02.batman15.ffffm.net" port 10010',
},
},
gw03 = {
key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
remotes = {
'"gw03.batman15.ffffm.net" port 10010',
},
},
gw04 = {
key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
remotes = {
'"gw04.batman15.ffffm.net" port 10010',
},
},
gw05 = {
key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
remotes = {
'"gw05.batman15.ffffm.net" port 10010',
},
},
gw06 = {
key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
remotes = {
'"gw06.batman15.ffffm.net" port 10010',
},
},
gw07 = {
key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
remotes = {
'"gw07.batman15.ffffm.net" port 10010',
},
},
gw08 = {
key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
remotes = {
'"gw08.batman15.ffffm.net" port 10010',
},
},
},
},
},
},
},
}
108 changes: 108 additions & 0 deletions domains/dom10.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
{
domain_names = {
dom10 = 'Domain 10',
ffffm_60528 = '60528 Frankfurt am Main',
ffffm_60529 = '60529 Frankfurt am Main',
ffffm_60549 = '60549 Frankfurt am Main',
ffffm_60596 = '60596 Frankfurt am Main',
ffffm_60598 = '60598 Frankfurt am Main',
ffffm_63263 = '63263 Neu-Isenburg'
},
domain_seed = '44529c784be1b0ac0f42ff680443a929cbb42f21895ead53ff22eafb059e8dd0',
hide_domain = { 'dom10' },

prefix4 = '10.176.160.0/20',
prefix6 = 'fd06:8187:fbca::/64',
extra_prefixes6 = { '2a06:8187:fbca::/64' },

next_node = {
name = { 'nextnode.ffffm.net', 'nextnode' },
ip4 = '10.176.175.254',
ip6 = 'fd06:8187:fbca::1:1',
mac = 'fa:ff:10:00:ff:ff',
},

wifi24 = {
ap = {
ssid = "ffm.freifunk.net",
},
mesh = {
id = 'ffffm-mesh-dom10',
},
},
wifi5 = {
ap = {
ssid = "ffm.freifunk.net",
},
mesh = {
id = 'ffffm-mesh-dom10',
},
},

mesh = {
vxlan = true,
batman_adv = {
routing_algo = 'BATMAN_IV',
},
},

mesh_vpn = {
fastd = {
groups = {
backbone = {
limit = 1,
peers = {
gw01 = {
key = 'e0852870545125d8b0688815a25397f69b5e675991b25caeb18770745de67805',
remotes = {
'"gw01.batman15.ffffm.net" port 10100',
},
},
gw02 = {
key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
remotes = {
'"gw02.batman15.ffffm.net" port 10100',
},
},
gw03 = {
key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
remotes = {
'"gw03.batman15.ffffm.net" port 10100',
},
},
gw04 = {
key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
remotes = {
'"gw04.batman15.ffffm.net" port 10100',
},
},
gw05 = {
key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
remotes = {
'"gw05.batman15.ffffm.net" port 10100',
},
},
gw06 = {
key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
remotes = {
'"gw06.batman15.ffffm.net" port 10100',
},
},
gw07 = {
key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
remotes = {
'"gw07.batman15.ffffm.net" port 10100',
},
},
gw08 = {
key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
remotes = {
'"gw08.batman15.ffffm.net" port 10100',
},
},
},
},
},
},
},
}
Loading

0 comments on commit a5e0888

Please sign in to comment.