diff --git a/README.md b/README.md
index aa3ed9e45..7cf2b583c 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/domains/dom0.conf b/domains/dom0.conf
new file mode 100644
index 000000000..1e6eab781
--- /dev/null
+++ b/domains/dom0.conf
@@ -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',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom1.conf b/domains/dom1.conf
new file mode 100644
index 000000000..267355c87
--- /dev/null
+++ b/domains/dom1.conf
@@ -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',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom10.conf b/domains/dom10.conf
new file mode 100644
index 000000000..8117c692f
--- /dev/null
+++ b/domains/dom10.conf
@@ -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',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom11.conf b/domains/dom11.conf
new file mode 100644
index 000000000..ba637ac9f
--- /dev/null
+++ b/domains/dom11.conf
@@ -0,0 +1,110 @@
+{
+ domain_names = {
+ dom11 = 'Domain 11',
+ ffffm_60594 = '60594 Frankfurt am Main',
+ ffffm_60599 = '60599 Frankfurt am Main',
+ ffffm_63065 = '63065 Offenbach am Main',
+ ffffm_63067 = '63067 Offenbach am Main',
+ ffffm_63069 = '63069 Offenbach am Main',
+ ffffm_63071 = '63071 Offenbach am Main',
+ ffffm_63073 = '63073 Offenbach am Main',
+ ffffm_63075 = '63075 Offenbach am Main'
+ },
+ domain_seed = '6bb355575be3a9f299e231e0b9a56fa996da18cd26d3c9f80f9317a03f80eda6',
+ hide_domain = { 'dom11' },
+
+ prefix4 = '10.176.176.0/20',
+ prefix6 = 'fd06:8187:fbcb::/64',
+ extra_prefixes6 = { '2a06:8187:fbcb::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.176.191.254',
+ ip6 = 'fd06:8187:fbcb::1:1',
+ mac = 'fa:ff:11:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom11',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom11',
+ },
+ },
+
+ 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 10110',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10110',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10110',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10110',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10110',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10110',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10110',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10110',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom12.conf b/domains/dom12.conf
new file mode 100644
index 000000000..45d152cac
--- /dev/null
+++ b/domains/dom12.conf
@@ -0,0 +1,116 @@
+{
+ domain_names = {
+ dom12 = 'Domain 12',
+ ffffm_61130 = '61130 Nidderau',
+ ffffm_61137 = '61137 Schöneck',
+ ffffm_61138 = '61138 Niederdorfelden',
+ ffffm_63450 = '63450 Hanau',
+ ffffm_63452 = '63452 Hanau',
+ ffffm_63454 = '63454 Hanau',
+ ffffm_63456 = '63456 Hanau',
+ ffffm_63457 = '63457 Hanau',
+ ffffm_63477 = '63477 Maintal',
+ ffffm_63486 = '63486 Bruchköbel',
+ ffffm_63526 = '63526 Erlensee',
+ ffffm_63538 = '63538 Großkrotzenburg',
+ ffffm_63543 = '63543 Neuberg',
+ ffffm_63546 = '63546 Hammersbach'
+ },
+ domain_seed = '93ab40e095f13b565aecef5327618dcfed2fbeeced2284ceb255a547d7ada2e1',
+ hide_domain = { 'dom12' },
+
+ prefix4 = '10.176.192.0/20',
+ prefix6 = 'fd06:8187:fbcc::/64',
+ extra_prefixes6 = { '2a06:8187:fbcc::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.176.207.254',
+ ip6 = 'fd06:8187:fbcc::1:1',
+ mac = 'fa:ff:12:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom12',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom12',
+ },
+ },
+
+ 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 10120',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10120',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10120',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10120',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10120',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10120',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10120',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10120',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom13.conf b/domains/dom13.conf
new file mode 100644
index 000000000..e5e71aa73
--- /dev/null
+++ b/domains/dom13.conf
@@ -0,0 +1,117 @@
+{
+ domain_names = {
+ dom13 = 'Domain 13',
+ ffffm_61250 = '61250 Usingen',
+ ffffm_61267 = '61267 Neu-Anspach',
+ ffffm_61273 = '61273 Wehrheim',
+ ffffm_61276 = '61276 Weilrod',
+ ffffm_61279 = '61279 Grävenwiesbach',
+ ffffm_61348 = '61348 Bad Homburg v.d. Höhe',
+ ffffm_61350 = '61350 Bad Homburg v.d. Höhe',
+ ffffm_61352 = '61352 Bad Homburg v.d. Höhe',
+ ffffm_61381 = '61381 Friedrichsdorf',
+ ffffm_61389 = '61389 Schmitten',
+ ffffm_61440 = '61440 Oberursel (Taunus)',
+ ffffm_61449 = '61449 Steinbach (Taunus)',
+ ffffm_61462 = '61462 Königstein im Taunus',
+ ffffm_61476 = '61476 Kronberg im Taunus',
+ ffffm_61479 = '61479 Glashütten'
+ },
+ domain_seed = '11078b264d2f0670136233f9c9b30003e868776ff1956c3af1a87ff64e7fd33a',
+ hide_domain = { 'dom13' },
+
+ prefix4 = '10.176.208.0/20',
+ prefix6 = 'fd06:8187:fbcd::/64',
+ extra_prefixes6 = { '2a06:8187:fbcd::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.176.223.254',
+ ip6 = 'fd06:8187:fbcd::1:1',
+ mac = 'fa:ff:13:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom13',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom13',
+ },
+ },
+
+ 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 10130',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10130',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10130',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10130',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10130',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10130',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10130',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10130',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom14.conf b/domains/dom14.conf
new file mode 100644
index 000000000..4b7486666
--- /dev/null
+++ b/domains/dom14.conf
@@ -0,0 +1,106 @@
+{
+ domain_names = {
+ dom14 = 'Domain 14',
+ ffffm_63150 = '63150 Heusenstamm',
+ ffffm_63165 = '63165 Mühlheim am Main',
+ ffffm_63179 = '63179 Obertshausen',
+ ffffm_63512 = '63512 Hainburg'
+ },
+ domain_seed = 'e40ec6530208fcfcb756f6f70a781a7337b0aef223cf62e7aff02b4c3a51522a',
+ hide_domain = { 'dom14' },
+
+ prefix4 = '10.176.224.0/20',
+ prefix6 = 'fd06:8187:fbce::/64',
+ extra_prefixes6 = { '2a06:8187:fbce::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.176.239.254',
+ ip6 = 'fd06:8187:fbce::1:1',
+ mac = 'fa:ff:14:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom14',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom14',
+ },
+ },
+
+ 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 10140',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10140',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10140',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10140',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10140',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10140',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10140',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10140',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom15.conf b/domains/dom15.conf
new file mode 100644
index 000000000..22a9fb3ea
--- /dev/null
+++ b/domains/dom15.conf
@@ -0,0 +1,118 @@
+{
+ domain_names = {
+ dom15 = 'Domain 15',
+ ffffm_63505 = '63505 Langenselbold',
+ ffffm_63517 = '63517 Rodenbach',
+ ffffm_63549 = '63549 Ronneburg',
+ ffffm_63571 = '63571 Gelnhausen',
+ ffffm_63579 = '63579 Freigericht',
+ ffffm_63584 = '63584 Gründau',
+ ffffm_63589 = '63589 Linsengericht',
+ ffffm_63594 = '63594 Hasselroth',
+ ffffm_63599 = '63599 Biebergemünd',
+ ffffm_63607 = '63607 Wächtersbach',
+ ffffm_63619 = '63619 Bad Orb',
+ ffffm_63628 = '63628 Bad Soden-Salmünster',
+ ffffm_63633 = '63633 Birstein',
+ ffffm_63636 = '63636 Brachttal',
+ ffffm_63637 = '63637 Jossgrund',
+ ffffm_63639 = '63639 Flörsbachtal'
+ },
+ domain_seed = '0947612a81c5acd525e82cdd2664b9b943d5b24f5928b952d4c12b0dbbe2c442',
+ hide_domain = { 'dom15' },
+
+ prefix4 = '10.176.240.0/20',
+ prefix6 = 'fd06:8187:fbcf::/64',
+ extra_prefixes6 = { '2a06:8187:fbcf::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.176.255.254',
+ ip6 = 'fd06:8187:fbcf::1:1',
+ mac = 'fa:ff:15:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom15',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom15',
+ },
+ },
+
+ 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 10150',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10150',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10150',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10150',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10150',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10150',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10150',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10150',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom16.conf b/domains/dom16.conf
new file mode 100644
index 000000000..1a4d64b64
--- /dev/null
+++ b/domains/dom16.conf
@@ -0,0 +1,103 @@
+{
+ domain_names = {
+ dom16 = 'Domain 16',
+ ffffm_65451 = '65451 Kelsterbach'
+ },
+ domain_seed = '7c696def84b72069dec04553852f2806fdcf90b1b2a49faa6125ad42fc9819ae',
+ hide_domain = { 'dom16' },
+
+ prefix4 = '10.177.0.0/20',
+ prefix6 = 'fd06:8187:fbd0::/64',
+ extra_prefixes6 = { '2a06:8187:fbd0::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.177.15.254',
+ ip6 = 'fd06:8187:fbd0::1:1',
+ mac = 'fa:ff:16:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom16',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom16',
+ },
+ },
+
+ 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 10160',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10160',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10160',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10160',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10160',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10160',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10160',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10160',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom17.conf b/domains/dom17.conf
new file mode 100644
index 000000000..39fd33a2c
--- /dev/null
+++ b/domains/dom17.conf
@@ -0,0 +1,112 @@
+{
+ domain_names = {
+ dom17 = 'Domain 17',
+ ffffm_65719 = '65719 Hofheim am Taunus',
+ ffffm_65760 = '65760 Eschborn',
+ ffffm_65779 = '65779 Kelkheim',
+ ffffm_65795 = '65795 Hattersheim',
+ ffffm_65812 = '65812 Bad Soden am Taunus',
+ ffffm_65817 = '65817 Eppstein',
+ ffffm_65824 = '65824 Schwalbach am Taunus',
+ ffffm_65830 = '65830 Kriftel',
+ ffffm_65835 = '65835 Liederbach am Taunus',
+ ffffm_65843 = '65843 Sulzbach (Taunus)'
+ },
+ domain_seed = 'c02710bc3ccb8b7c319e5c650636c82b125ca1453c66318433a216a6fae1ede0',
+ hide_domain = { 'dom17' },
+
+ prefix4 = '10.177.16.0/20',
+ prefix6 = 'fd06:8187:fbd1::/64',
+ extra_prefixes6 = { '2a06:8187:fbd1::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.177.31.254',
+ ip6 = 'fd06:8187:fbd1::1:1',
+ mac = 'fa:ff:17:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom17',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom17',
+ },
+ },
+
+ 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 10170',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10170',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10170',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10170',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10170',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10170',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10170',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10170',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom2.conf b/domains/dom2.conf
index fc5f3f04f..e15a0b6a7 100644
--- a/domains/dom2.conf
+++ b/domains/dom2.conf
@@ -35,10 +35,10 @@
},
mesh = {
- vxlan = true,
- batman_adv = {
- routing_algo = 'BATMAN_IV',
- },
+ vxlan = true,
+ batman_adv = {
+ routing_algo = 'BATMAN_IV',
+ },
},
mesh_vpn = {
@@ -100,4 +100,4 @@
},
},
},
-}
+}
\ No newline at end of file
diff --git a/domains/dom3.conf b/domains/dom3.conf
new file mode 100644
index 000000000..1f565834b
--- /dev/null
+++ b/domains/dom3.conf
@@ -0,0 +1,124 @@
+{
+ domain_names = {
+ dom3 = 'Domain 3',
+ ffffm_35510 = '35510 Butzbach',
+ ffffm_35519 = '35519 Rockenberg',
+ ffffm_61118 = '61118 Bad Vilbel',
+ ffffm_61169 = '61169 Friedberg (Hessen)',
+ ffffm_61184 = '61184 Karben',
+ ffffm_61191 = '61191 Rosbach v.d. Höhe',
+ ffffm_61194 = '61194 Niddatal',
+ ffffm_61197 = '61197 Florstadt',
+ ffffm_61200 = '61200 Wölfersheim',
+ ffffm_61203 = '61203 Reichelsheim (Wetterau)',
+ ffffm_61206 = '61206 Wöllstadt',
+ ffffm_61209 = '61209 Echzell',
+ ffffm_61231 = '61231 Bad Nauheim',
+ ffffm_61239 = '61239 Ober-Mörlen',
+ ffffm_63654 = '63654 Büdingen',
+ ffffm_63667 = '63667 Nidda',
+ ffffm_63674 = '63674 Altenstadt',
+ ffffm_63683 = '63683 Ortenberg',
+ ffffm_63691 = '63691 Ranstadt',
+ ffffm_63694 = '63694 Limeshain',
+ ffffm_63695 = '63695 Glauburg',
+ ffffm_63699 = '63699 Kefenrod'
+ },
+ domain_seed = 'f85ab955808b5295675557c7f0c6e1846b91db469a59a47dc96c22bb6f2b2896',
+ hide_domain = { 'dom3' },
+
+ prefix4 = '10.176.48.0/20',
+ prefix6 = 'fd06:8187:fbc3::/64',
+ extra_prefixes6 = { '2a06:8187:fbc3::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.176.63.254',
+ ip6 = 'fd06:8187:fbc3::1:1',
+ mac = 'fa:ff:03:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom3',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom3',
+ },
+ },
+
+ 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 10030',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10030',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10030',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10030',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10030',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10030',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10030',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10030',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom4.conf b/domains/dom4.conf
new file mode 100644
index 000000000..2fc56f0fd
--- /dev/null
+++ b/domains/dom4.conf
@@ -0,0 +1,109 @@
+{
+ domain_names = {
+ dom4 = 'Domain 4',
+ ffffm_60311 = '60311 Frankfurt am Main',
+ ffffm_60313 = '60313 Frankfurt am Main',
+ ffffm_60316 = '60316 Frankfurt am Main',
+ ffffm_60318 = '60318 Frankfurt am Main',
+ ffffm_60322 = '60322 Frankfurt am Main',
+ ffffm_60325 = '60325 Frankfurt am Main',
+ ffffm_60329 = '60329 Frankfurt am Main'
+ },
+ domain_seed = '197bb0f4afef64e375d3c7cef3406d211859c866519b74875ef31b72b05b3146',
+ hide_domain = { 'dom4' },
+
+ prefix4 = '10.176.64.0/20',
+ prefix6 = 'fd06:8187:fbc4::/64',
+ extra_prefixes6 = { '2a06:8187:fbc4::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.176.79.254',
+ ip6 = 'fd06:8187:fbc4::1:1',
+ mac = 'fa:ff:04:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom4',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom4',
+ },
+ },
+
+ 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 10040',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10040',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10040',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10040',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10040',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10040',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10040',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10040',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom5.conf b/domains/dom5.conf
new file mode 100644
index 000000000..c9722ebe7
--- /dev/null
+++ b/domains/dom5.conf
@@ -0,0 +1,105 @@
+{
+ domain_names = {
+ dom5 = 'Domain 5',
+ ffffm_60314 = '60314 Frankfurt am Main',
+ ffffm_60386 = '60386 Frankfurt am Main',
+ ffffm_60388 = '60388 Frankfurt am Main'
+ },
+ domain_seed = '994ceb49ab703ba17477c834399a7868b86b75d0e6970c731d2e9e390308c4c9',
+ hide_domain = { 'dom5' },
+
+ prefix4 = '10.176.80.0/20',
+ prefix6 = 'fd06:8187:fbc5::/64',
+ extra_prefixes6 = { '2a06:8187:fbc5::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.176.95.254',
+ ip6 = 'fd06:8187:fbc5::1:1',
+ mac = 'fa:ff:05:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom5',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom5',
+ },
+ },
+
+ 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 10050',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10050',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10050',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10050',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10050',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10050',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10050',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10050',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom6.conf b/domains/dom6.conf
new file mode 100644
index 000000000..c9ef70f92
--- /dev/null
+++ b/domains/dom6.conf
@@ -0,0 +1,106 @@
+{
+ domain_names = {
+ dom6 = 'Domain 6',
+ ffffm_60320 = '60320 Frankfurt am Main',
+ ffffm_60385 = '60385 Frankfurt am Main',
+ ffffm_60389 = '60389 Frankfurt am Main',
+ ffffm_60435 = '60435 Frankfurt am Main'
+ },
+ domain_seed = '56ef127a838984d18e83ae9f0127339f4b66a0d0a6d810558c0da4ea70938831',
+ hide_domain = { 'dom6' },
+
+ prefix4 = '10.176.96.0/20',
+ prefix6 = 'fd06:8187:fbc6::/64',
+ extra_prefixes6 = { '2a06:8187:fbc6::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.176.111.254',
+ ip6 = 'fd06:8187:fbc6::1:1',
+ mac = 'fa:ff:06:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom6',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom6',
+ },
+ },
+
+ 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 10060',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10060',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10060',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10060',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10060',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10060',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10060',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10060',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom7.conf b/domains/dom7.conf
new file mode 100644
index 000000000..f477ad1ab
--- /dev/null
+++ b/domains/dom7.conf
@@ -0,0 +1,109 @@
+{
+ domain_names = {
+ dom7 = 'Domain 7',
+ ffffm_60323 = '60323 Frankfurt am Main',
+ ffffm_60431 = '60431 Frankfurt am Main',
+ ffffm_60439 = '60439 Frankfurt am Main',
+ ffffm_60486 = '60486 Frankfurt am Main',
+ ffffm_60487 = '60487 Frankfurt am Main',
+ ffffm_60488 = '60488 Frankfurt am Main',
+ ffffm_60489 = '60489 Frankfurt am Main'
+ },
+ domain_seed = 'd46ae2e7d9946e186633bd23b7b0f31d10f9c289c30e3b86716ba780b8599608',
+ hide_domain = { 'dom7' },
+
+ prefix4 = '10.176.112.0/20',
+ prefix6 = 'fd06:8187:fbc7::/64',
+ extra_prefixes6 = { '2a06:8187:fbc7::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.176.127.254',
+ ip6 = 'fd06:8187:fbc7::1:1',
+ mac = 'fa:ff:07:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom7',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom7',
+ },
+ },
+
+ 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 10070',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10070',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10070',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10070',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10070',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10070',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10070',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10070',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom8.conf b/domains/dom8.conf
new file mode 100644
index 000000000..6af51693f
--- /dev/null
+++ b/domains/dom8.conf
@@ -0,0 +1,109 @@
+{
+ domain_names = {
+ dom8 = 'Domain 8',
+ ffffm_60326 = '60326 Frankfurt am Main',
+ ffffm_60327 = '60327 Frankfurt am Main',
+ ffffm_65929 = '65929 Frankfurt am Main',
+ ffffm_65931 = '65931 Frankfurt am Main',
+ ffffm_65933 = '65933 Frankfurt am Main',
+ ffffm_65934 = '65934 Frankfurt am Main',
+ ffffm_65936 = '65936 Frankfurt am Main'
+ },
+ domain_seed = '8d4116c8ed8b0bc297808c2de74a8ebdc7dfa650769519eb0f9cab60089cbdba',
+ hide_domain = { 'dom8' },
+
+ prefix4 = '10.176.128.0/20',
+ prefix6 = 'fd06:8187:fbc8::/64',
+ extra_prefixes6 = { '2a06:8187:fbc8::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.176.143.254',
+ ip6 = 'fd06:8187:fbc8::1:1',
+ mac = 'fa:ff:08:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom8',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom8',
+ },
+ },
+
+ 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 10080',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10080',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10080',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10080',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10080',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10080',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10080',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10080',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/domains/dom9.conf b/domains/dom9.conf
new file mode 100644
index 000000000..1d369922a
--- /dev/null
+++ b/domains/dom9.conf
@@ -0,0 +1,105 @@
+{
+ domain_names = {
+ dom9 = 'Domain 9',
+ ffffm_60433 = '60433 Frankfurt am Main',
+ ffffm_60437 = '60437 Frankfurt am Main',
+ ffffm_60438 = '60438 Frankfurt am Main'
+ },
+ domain_seed = '7ae64135fe895e705d6a3cf68f5a95022b82242fb94ecd7fd8d095b8bd8a516d',
+ hide_domain = { 'dom9' },
+
+ prefix4 = '10.176.144.0/20',
+ prefix6 = 'fd06:8187:fbc9::/64',
+ extra_prefixes6 = { '2a06:8187:fbc9::/64' },
+
+ next_node = {
+ name = { 'nextnode.ffffm.net', 'nextnode' },
+ ip4 = '10.176.159.254',
+ ip6 = 'fd06:8187:fbc9::1:1',
+ mac = 'fa:ff:09:00:ff:ff',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom9',
+ },
+ },
+ wifi5 = {
+ ap = {
+ ssid = "ffm.freifunk.net",
+ },
+ mesh = {
+ id = 'ffffm-mesh-dom9',
+ },
+ },
+
+ 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 10090',
+ },
+ },
+ gw02 = {
+ key = 'ce38642d5812798bf6e735f2fb757e32f1797092770f7aa310bf5691572c0748',
+ remotes = {
+ '"gw02.batman15.ffffm.net" port 10090',
+ },
+ },
+ gw03 = {
+ key = 'ab4f16ba4860da6239dca1f1b7e54cdc89602146d4fc7471de7ffbc6f233e2f7',
+ remotes = {
+ '"gw03.batman15.ffffm.net" port 10090',
+ },
+ },
+ gw04 = {
+ key = 'af8797890b61446fa8d1d69d9f92628632ddf5a6dcd2f39564dc8670eb7ac6be',
+ remotes = {
+ '"gw04.batman15.ffffm.net" port 10090',
+ },
+ },
+ gw05 = {
+ key = 'd95503e4e8980b8154ea38ddc84b25c90fae198c13577b31c7813d9aac6269fd',
+ remotes = {
+ '"gw05.batman15.ffffm.net" port 10090',
+ },
+ },
+ gw06 = {
+ key = 'f098b594422d71a188e68fd6ac909ec152c9c0f3dac1cd218145c89e236028f6',
+ remotes = {
+ '"gw06.batman15.ffffm.net" port 10090',
+ },
+ },
+ gw07 = {
+ key = '4ea222b6e9d0ce7d69f0ab240cc985d5d53d6a397409bdc8bc727430f8847cc9',
+ remotes = {
+ '"gw07.batman15.ffffm.net" port 10090',
+ },
+ },
+ gw08 = {
+ key = '035f2a9127df6fdaa2c8f65eb85b37229f931c4393d75e0590cc4b3583df6633',
+ remotes = {
+ '"gw08.batman15.ffffm.net" port 10090',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+}
\ No newline at end of file
diff --git a/i18n/de.po b/i18n/de.po
index 7e853d44e..f507ed881 100644
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -31,3 +31,11 @@ msgstr ""
"http://192.168.1.1 zu erreichen."
"Viel Spaß mit deinem neuen Freifunk-Knoten und der Erkundung von Freifunk!
"
+msgid "gluon-config-mode:domain-select"
+msgstr ""
+" Bitte wähle deine Domain aus. Beachte, dass nur Knoten derselben Domain miteinander meshen können.
"
+" Solltest du dir unsicher sein, dann wähle 'Single Domain' aus.
"
+
+msgid "gluon-config-mode:domain"
+msgstr ""
+"Domain"
diff --git a/i18n/en.po b/i18n/en.po
index 25b04ac82..ea27bfecb 100644
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -28,3 +28,11 @@ msgstr ""
"mode."
"Have fun with your new Freifunk node and exploring the Freifunk network!
"
+msgid "gluon-config-mode:domain-select"
+msgstr ""
+" Please choose your domain. Please note that only nodes of the same domain can mesh with each other.
"
+" If you are unsure, then select 'Single Domain'.
"
+
+msgid "gluon-config-mode:domain"
+msgstr ""
+"Domain"
diff --git a/modules b/modules
index fe359b073..5268a127f 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,7 @@
-GLUON_SITE_FEEDS='ffffm_packages'
+GLUON_SITE_FEEDS='ffffm_packages ffda_packages'
PACKAGES_FFFFM_PACKAGES_REPO=git://github.com/freifunk-ffm/packages.git
PACKAGES_FFFFM_PACKAGES_COMMIT=94406af836d50b3d0435565953b9a89cfcc69e73
+
+PACKAGES_FFDA_PACKAGES_REPO=git://github.com/freifunk-darmstadt/ffda-packages
+PACKAGES_FFDA_PACKAGES_COMMIT=57622c757b0166f0e02ed58acbd7976426be9e87
diff --git a/site.conf b/site.conf
index b9466eb18..37e093c00 100644
--- a/site.conf
+++ b/site.conf
@@ -39,6 +39,11 @@
},
},
+ domain_director = {
+ url = 'http://director.ffffm.net/',
+ switch_after_offline = 360,
+ },
+
mesh_vpn = {
enabled = true,
mtu = 1312,
diff --git a/site.mk b/site.mk
index c2f715495..1faf52d82 100644
--- a/site.mk
+++ b/site.mk
@@ -1,6 +1,7 @@
GLUON_FEATURES := \
autoupdater \
config-mode-outdoor \
+ config-mode-domain-select \
ebtables-filter-multicast \
ebtables-filter-ra-dhcp \
ebtables-source-filter \
@@ -10,12 +11,16 @@ GLUON_FEATURES := \
respondd \
status-page \
web-wizard \
+ web-private-wifi \
+ web-logging \
+ web-advanced \
GLUON_SITE_PACKAGES := \
iwinfo \
haveged \
ffffm-button-bind \
respondd-module-airtime \
+ ffda-domain-director \
include $(GLUON_SITEDIR)/specific_site.mk
@@ -27,7 +32,7 @@ GLUON_MULTIDOMAIN := 1
# This is the Stable branch
# Gluon Base Release
-DEFAULT_GLUON_RELEASE := v4.1
+DEFAULT_GLUON_RELEASE := v4.2
# Development branch information
GLUON_BRANCH ?= stable