diff --git a/domains/01/site.conf b/domains/01/site.conf index 9d8abb5..aee3bda 100644 --- a/domains/01/site.conf +++ b/domains/01/site.conf @@ -1,96 +1,35 @@ { - authorized_keys = { 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDdm5b4sh3xIG43MFurqYT0hx89xITSRRyDE/WwPPcqDqjFpdb2hJOy6aHHPQ1W2OY12VSOqBuFLeqI6TKOVTCyd36GeaEzpoCrV0NDM5hFJEH/v7Q/cgP87lqqSfa5GEFJW1CKj02Ptf77JJSD8JOFjES0Ue+8qMyL0EQKSZ/sKvnGZKaQQNPTkTY/yP4T6jwBYqBMea7f7q19cYNcPyZR/50IZyHADXcTSfmvvMmjL34OPn/X84ZpfDtGtMwgWJi/BwSG6D2Z0XKNMwECxaNcGUvjdY8vyXR0EYlWF5NVw86h/ShF+AGN3Bd4TZLV79krUeJkK3e36u0v+JT5C+03 root@esprimp-v5535', - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC4gKXfdlBiN8/HTjOr8E4Yt9sdVfpJ+5lDJeK/GAOM3JFDT7UTUiZd7p5RIa6V5RznYDIpQ6HO9AKeN29L1tqmjbg5qY9EAoeTD/kMBxAf1v71Dk4QS/NukEojiNl2ut7ACCOXVb9otbNpYGt55Saq67gkN12iS18Twdu+ejwEUxZH0YV2WtUZybgM6SMC203EdIyEAZ6fQoh9Kvv0YBdPR5+AQ4fZqO/enTk48f7hLza8wn6Zo9DD0GHasT2nLkmaSWef22HgIwUQXrKxkGDZPif9C6lIi35+ZE3O9M6njmLUGFHFH0+fvlygfO0SZPNYcXj8iMBXKymCdfSRW3BbEZX9ql6tk34SgNmu9fCGHnVr8fZUFfmh5NEwDL1IgdNB+894hGPGGMEO2B+OdxsWCmwCnGhHVHYsxzP3ybEgKBlnTbTDjJoeD5yL0ig799NmnaHO0t4G/YLoNyR3KH2sYwXeiKoJkWmYtp1WCZZjT+JnMrabdquBYI2axcRbtdeNNtUnjl608dMQb7AeIARqzyoIiVkaVDaGFii5c1V/ygD3ri1u6laTYVSLfrPVkYBJsJ+DuLSbj/tz/fwfTUOO1h60Mu6VFi0m4kBtgK2H7gCCnmhMke2xzzi9pPBDGxJ97HrrxqSD21kVk39ssKTwRqDaV7LVgHLAQcmRsZxfjw== martin@martin-ThinkPad-T450s' }, - - hostname_prefix = 'ffTST', - site_name = 'Freifunk DON Domäne 01 TEST', - site_code = 'ffdond01', - domain_seed = 'b9d58035a5a2256627a813ee9d10ebdbf53bbac562fddf240c28ed2becf4c0ec', + hostname_prefix = 'ffdon-', + site_name = 'Freifunk Donau-Ries', + site_code = 'ffdon', + default_domain = 'ffdon_test', + + mesh_on_lan = true, - prefix4 = '10.86.8.0/22', - prefix6 = '2a03:2260:3005:100::/64', - -- timezone timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - + -- network ntp services ntp_servers = { '0.de.pool.ntp.org', '1.de.pool.ntp.org', '2.de.pool.ntp.org', '3.de.pool.ntp.org' }, - + -- regulatory domain of your wifi regdom = 'DE', - - -- config mode reglements - config_mode = { - hostname = { - optional = true, - }, - geo_location = { - show_altitude = true, - }, - remote_login = { - show_password_form = true, - min_password_length = 10, - }, - }, wifi24 = { channel = 1, - ap = { - ssid = 'TEST@Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:08:00', - bssid = '02:00:0a:56:08:00', - mcast_rate = 12000, - }, }, wifi5 = { channel = 44, - ap = { - ssid = 'TEST@Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:08:00', - bssid = '02:00:0a:56:08:00', - mcast_rate = 12000, - }, }, - - next_node = { - name = { 'knoten', }, - ip4 = '10.86.8.1', - ip6 = '2a03:2260:3005:100::1', - mac = '02:00:0a:56:08:01', - }, - - dns = { - cacheentries = 20000, - servers = { '2a03:2260:3005:100::2', '2a03:2260:3005:100::5' }, - }, - - mesh = { - vxlan = false, - }, mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom01snode01.ffdon.de:20001', - 'dom01snode02.ffdon.de:20001', - }, - }, - bandwidth_limit = { - enabled = false, - ingress = 25000, - egress = 5000, + enabled = false, + ingress = 25000, + egress = 5000, }, }, - - -- mesh on LAN config - mesh_on_lan = true, - + -- autoupdater config autoupdater = { branch = 'stable', @@ -98,9 +37,8 @@ stable = { name = 'stable', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-01/stable/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-01/stable/sysupgrade', - + 'http://1.updates.services.ffdon/ffdonV2/stable/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/stable/sysupgrade', }, good_signatures = 3, pubkeys = { @@ -118,8 +56,8 @@ beta = { name = 'beta', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-01/beta/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-01/beta/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/beta/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/beta/sysupgrade', }, good_signatures = 2, pubkeys = { @@ -132,13 +70,13 @@ 'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath '50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische '24b25027ebe9c76ece1db0e562755f852b35c92e5a68f63f831bb4e6ad7b4bef', -- FFDON-mgk - '6c196570ee5f8f4a567d5e2ae9d37c07dc2e40ef737724ae55f424cd079bac07', -- FF-Buildservice - }, }, + }, + }, experimental = { name = 'experimental', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-01/experimental/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-01/experimental/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/experimental/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/experimental/sysupgrade', }, good_signatures = 1, pubkeys = { @@ -151,10 +89,8 @@ 'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath '50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische '24b25027ebe9c76ece1db0e562755f852b35c92e5a68f63f831bb4e6ad7b4bef', -- FFDON-mgk - '6c196570ee5f8f4a567d5e2ae9d37c07dc2e40ef737724ae55f424cd079bac07', -- FF-Buildservice }, }, }, }, - mesh_on_lan = true, } diff --git a/domains/03/site.conf b/domains/03/site.conf index d07197b..498d882 100644 --- a/domains/03/site.conf +++ b/domains/03/site.conf @@ -1,78 +1,35 @@ { - hostname_prefix = 'ffDon', - site_name = 'Freifunk DON Domäne 03 Donauwoerth', - site_code = 'ffdond03', - domain_seed = '19628ca4709ecdf2fc2dadb9202a2a41b47b21dfc589d28b5a7e25a81e1e093d', - - prefix4 = '10.86.16.0/22', - prefix6 = '2a03:2260:3005:300::/64', + hostname_prefix = 'ffdon-', + site_name = 'Freifunk Donau-Ries', + site_code = 'ffdon', + default_domain = 'ffdon_donauwoerth', mesh_on_lan = true, - + -- timezone timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - + -- network ntp services ntp_servers = { '0.de.pool.ntp.org', '1.de.pool.ntp.org', '2.de.pool.ntp.org', '3.de.pool.ntp.org' }, - + -- regulatory domain of your wifi regdom = 'DE', wifi24 = { channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:10:00', - bssid = '02:00:0a:56:10:00', - mcast_rate = 12000, - }, }, wifi5 = { channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:10:00', - bssid = '02:00:0a:56:10:00', - mcast_rate = 12000, - }, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.16.1', - ip6 = '2a03:2260:3005:300::1', - mac = '02:00:0a:56:10:01', }, - dns = { - cacheentries = 20000, - servers = { '2a03:2260:3005:300::2', '2a03:2260:3005:300::5' }, - }, - - mesh = { - vxlan = false, - }, - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom03snode01.ffdon.de:20003', - 'dom03snode02.ffdon.de:20003', - }, - }, - bandwidth_limit = { - enabled = false, - ingress = 25000, - egress = 5000, + enabled = false, + ingress = 25000, + egress = 5000, }, }, - + -- autoupdater config autoupdater = { branch = 'stable', @@ -80,8 +37,8 @@ stable = { name = 'stable', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-03/stable/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-03/stable/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/stable/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/stable/sysupgrade', }, good_signatures = 3, pubkeys = { @@ -99,8 +56,8 @@ beta = { name = 'beta', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-03/beta/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-03/beta/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/beta/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/beta/sysupgrade', }, good_signatures = 2, pubkeys = { @@ -113,12 +70,13 @@ 'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath '50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische '24b25027ebe9c76ece1db0e562755f852b35c92e5a68f63f831bb4e6ad7b4bef', -- FFDON-mgk - }, }, + }, + }, experimental = { name = 'experimental', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-03/experimental/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-03/experimental/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/experimental/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/experimental/sysupgrade', }, good_signatures = 1, pubkeys = { diff --git a/domains/05/site.conf b/domains/05/site.conf index e6ea26d..d8f5cc2 100644 --- a/domains/05/site.conf +++ b/domains/05/site.conf @@ -1,78 +1,35 @@ { - hostname_prefix = 'ffNoe', - site_name = 'Freifunk DON Domäne 05 Noerdlingen', - site_code = 'ffdond05', - domain_seed = '62a59be11fe1fec41787c6375c48a0e1886a29703af2a08bd3c14ba82e59db31', - - prefix4 = '10.86.24.0/22', - prefix6 = '2a03:2260:3005:500::/64', + hostname_prefix = 'ffdon-', + site_name = 'Freifunk Donau-Ries', + site_code = 'ffdon', + default_domain = 'ffdon_noerdlingen', mesh_on_lan = true, - + -- timezone timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - + -- network ntp services ntp_servers = { '0.de.pool.ntp.org', '1.de.pool.ntp.org', '2.de.pool.ntp.org', '3.de.pool.ntp.org' }, - + -- regulatory domain of your wifi regdom = 'DE', wifi24 = { channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:18:00', - bssid = '02:00:0a:56:18:00', - mcast_rate = 12000, - }, }, wifi5 = { channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:18:00', - bssid = '02:00:0a:56:18:00', - mcast_rate = 12000, - }, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.24.1', - ip6 = '2a03:2260:3005:500::1', - mac = '02:00:0a:56:18:01', }, - dns = { - cacheentries = 20000, - servers = { '2a03:2260:3005:500::2', '2a03:2260:3005:500::5' }, - }, - - mesh = { - vxlan = false, - }, - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom05snode01.ffdon.de:20005', - 'dom05snode02.ffdon.de:20005', - }, - }, - bandwidth_limit = { - enabled = false, - ingress = 25000, - egress = 5000, + enabled = false, + ingress = 25000, + egress = 5000, }, }, - + -- autoupdater config autoupdater = { branch = 'stable', @@ -80,9 +37,8 @@ stable = { name = 'stable', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-05/stable/sysupgrade', - 'http://firmware.ffdon.de/site-ffdon/stable/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-05/stable/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/stable/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/stable/sysupgrade', }, good_signatures = 3, pubkeys = { @@ -100,9 +56,8 @@ beta = { name = 'beta', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-05/beta/sysupgrade', - 'http://firmware.ffdon.de/site-ffdon/beta/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-05/beta/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/beta/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/beta/sysupgrade', }, good_signatures = 2, pubkeys = { @@ -115,13 +70,13 @@ 'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath '50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische '24b25027ebe9c76ece1db0e562755f852b35c92e5a68f63f831bb4e6ad7b4bef', -- FFDON-mgk - }, }, + }, + }, experimental = { name = 'experimental', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-05/experimental/sysupgrade', - 'http://firmware.ffdon.de/site-ffdon/experimental/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-05/experimental/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/experimental/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/experimental/sysupgrade', }, good_signatures = 1, pubkeys = { diff --git a/domains/07/site.conf b/domains/07/site.conf index d2fd3a5..097d42a 100644 --- a/domains/07/site.conf +++ b/domains/07/site.conf @@ -1,78 +1,35 @@ { - hostname_prefix = 'ffWem', - site_name = 'Freifunk DON Domäne 07 Wemding', - site_code = 'ffdond07', - domain_seed = 'acae56118dd203a003ac65fce8d63201d8a4db0ef4dc48b8496a6eb365bed28f', - - prefix4 = '10.86.32.0/22', - prefix6 = '2a03:2260:3005:700::/64', + hostname_prefix = 'ffdon-', + site_name = 'Freifunk Donau-Ries', + site_code = 'ffdon', + default_domain = 'ffdon_wemding', mesh_on_lan = true, - + -- timezone timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - + -- network ntp services ntp_servers = { '0.de.pool.ntp.org', '1.de.pool.ntp.org', '2.de.pool.ntp.org', '3.de.pool.ntp.org' }, - + -- regulatory domain of your wifi regdom = 'DE', wifi24 = { channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:20:00', - bssid = '02:00:0a:56:20:00', - mcast_rate = 12000, - }, }, wifi5 = { channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:20:00', - bssid = '02:00:0a:56:20:00', - mcast_rate = 12000, - }, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.32.1', - ip6 = '2a03:2260:3005:700::1', - mac = '02:00:0a:56:20:01', }, - dns = { - cacheentries = 20000, - servers = { '2a03:2260:3005:700::2', '2a03:2260:3005:700::5' }, - }, - - mesh = { - vxlan = false, - }, - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom07snode01.ffdon.de:20007', - 'dom07snode02.ffdon.de:20007', - }, - }, - bandwidth_limit = { - enabled = false, - ingress = 25000, - egress = 5000, + enabled = false, + ingress = 25000, + egress = 5000, }, }, - + -- autoupdater config autoupdater = { branch = 'stable', @@ -80,8 +37,8 @@ stable = { name = 'stable', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-07/stable/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-07/stable/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/stable/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/stable/sysupgrade', }, good_signatures = 3, pubkeys = { @@ -99,8 +56,8 @@ beta = { name = 'beta', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-07/beta/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-07/beta/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/beta/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/beta/sysupgrade', }, good_signatures = 2, pubkeys = { @@ -118,8 +75,8 @@ experimental = { name = 'experimental', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-07/experimental/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-07/experimental/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/experimental/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/experimental/sysupgrade', }, good_signatures = 1, pubkeys = { diff --git a/domains/09/site.conf b/domains/09/site.conf index e13083c..7457732 100644 --- a/domains/09/site.conf +++ b/domains/09/site.conf @@ -1,78 +1,35 @@ { - hostname_prefix = 'ffBae', - site_name = 'Freifunk DON Domäne 09 Baeumenheim', - site_code = 'ffdond09', - domain_seed = '76ac450b2773eacadf163cee1d52992b11cd80f79f6edd049f543288da776194', - - prefix4 = '10.86.40.0/22', - prefix6 = '2a03:2260:3005:900::/64', + hostname_prefix = 'ffdon-', + site_name = 'Freifunk Donau-Ries', + site_code = 'ffdon', + default_domain = 'ffdon_baeumenheim', mesh_on_lan = true, - + -- timezone timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - + -- network ntp services ntp_servers = { '0.de.pool.ntp.org', '1.de.pool.ntp.org', '2.de.pool.ntp.org', '3.de.pool.ntp.org' }, - + -- regulatory domain of your wifi regdom = 'DE', wifi24 = { channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:28:00', - bssid = '02:00:0a:56:28:00', - mcast_rate = 12000, - }, }, wifi5 = { channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:28:00', - bssid = '02:00:0a:56:28:00', - mcast_rate = 12000, - }, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.40.1', - ip6 = '2a03:2260:3005:900::1', - mac = '02:00:0a:56:28:01', }, - dns = { - cacheentries = 20000, - servers = { '2a03:2260:3005:900::2', '2a03:2260:3005:900::5' }, - }, - - mesh = { - vxlan = false, - }, - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom09snode01.ffdon.de:20009', - 'dom09snode02.ffdon.de:20009', - }, - }, - bandwidth_limit = { - enabled = false, - ingress = 25000, - egress = 5000, + enabled = false, + ingress = 25000, + egress = 5000, }, }, - + -- autoupdater config autoupdater = { branch = 'stable', @@ -80,8 +37,8 @@ stable = { name = 'stable', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-09/stable/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-09/stable/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/stable/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/stable/sysupgrade', }, good_signatures = 3, pubkeys = { @@ -99,8 +56,8 @@ beta = { name = 'beta', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-09/beta/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-09/beta/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/beta/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/beta/sysupgrade', }, good_signatures = 2, pubkeys = { @@ -118,8 +75,8 @@ experimental = { name = 'experimental', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-09/experimental/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-09/experimental/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/experimental/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/experimental/sysupgrade', }, good_signatures = 1, pubkeys = { diff --git a/domains/11/site.conf b/domains/11/site.conf index 8ddc18b..84aa705 100644 --- a/domains/11/site.conf +++ b/domains/11/site.conf @@ -1,78 +1,35 @@ { - hostname_prefix = 'ffMon', - site_name = 'Freifunk DON Domäne 11 Monheim', - site_code = 'ffdond11', - domain_seed = '794b08e76a221a91097597dd4c6092bc1b158748c1a1307cb0b5655b2cbe4b4d', - - prefix4 = '10.86.48.0/22', - prefix6 = '2a03:2260:3005:1100::/64', + hostname_prefix = 'ffdon-', + site_name = 'Freifunk Donau-Ries', + site_code = 'ffdon', + default_domain = 'ffdon_monheim', mesh_on_lan = true, - + -- timezone timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - + -- network ntp services ntp_servers = { '0.de.pool.ntp.org', '1.de.pool.ntp.org', '2.de.pool.ntp.org', '3.de.pool.ntp.org' }, - + -- regulatory domain of your wifi regdom = 'DE', wifi24 = { channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:30:00', - bssid = '02:00:0a:56:30:00', - mcast_rate = 12000, - }, }, wifi5 = { channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:30:00', - bssid = '02:00:0a:56:30:00', - mcast_rate = 12000, - }, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.48.1', - ip6 = '2a03:2260:3005:1100::1', - mac = '02:00:0a:56:30:01', }, - dns = { - cacheentries = 20000, - servers = { '2a03:2260:3005:1100::2', '2a03:2260:3005:1100::5' }, - }, - - mesh = { - vxlan = false, - }, - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom11snode01.ffdon.de:20011', - 'dom11snode02.ffdon.de:20011', - }, - }, - bandwidth_limit = { - enabled = false, - ingress = 25000, - egress = 5000, + enabled = false, + ingress = 25000, + egress = 5000, }, }, - + -- autoupdater config autoupdater = { branch = 'stable', @@ -80,8 +37,8 @@ stable = { name = 'stable', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-11/stable/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-11/stable/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/stable/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/stable/sysupgrade', }, good_signatures = 3, pubkeys = { @@ -99,8 +56,8 @@ beta = { name = 'beta', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-11/beta/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-11/beta/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/beta/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/beta/sysupgrade', }, good_signatures = 2, pubkeys = { @@ -113,12 +70,13 @@ 'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath '50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische '24b25027ebe9c76ece1db0e562755f852b35c92e5a68f63f831bb4e6ad7b4bef', -- FFDON-mgk - }, }, + }, + }, experimental = { name = 'experimental', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-11/experimental/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-11/experimental/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/experimental/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/experimental/sysupgrade', }, good_signatures = 1, pubkeys = { diff --git a/domains/13/site.conf b/domains/13/site.conf index d540d42..4d55ea5 100644 --- a/domains/13/site.conf +++ b/domains/13/site.conf @@ -1,78 +1,35 @@ { - hostname_prefix = 'ffHar', - site_name = 'Freifunk DON Domäne 13 Harburg', - site_code = 'ffdond13', - domain_seed = '2c3be78ee3ddebbdf247e06f386cdda58b2964fbd064473d5e6b4c138540df24', - - prefix4 = '10.86.56.0/22', - prefix6 = '2a03:2260:3005:1300::/64', + hostname_prefix = 'ffdon-', + site_name = 'Freifunk Donau-Ries', + site_code = 'ffdon', + default_domain = 'ffdon_harburg', mesh_on_lan = true, - + -- timezone timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - + -- network ntp services ntp_servers = { '0.de.pool.ntp.org', '1.de.pool.ntp.org', '2.de.pool.ntp.org', '3.de.pool.ntp.org' }, - + -- regulatory domain of your wifi regdom = 'DE', wifi24 = { channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:38:00', - bssid = '02:00:0a:56:38:00', - mcast_rate = 12000, - }, }, wifi5 = { channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:38:00', - bssid = '02:00:0a:56:38:00', - mcast_rate = 12000, - }, - }, - - next_node = { - name = { 'knoten' }, - ip44 = '10.86.56.1', - ip6 = '2a03:2260:3005:1300::1', - mac = '02:00:0a:56:38:01', }, - dns = { - cacheentries = 20000, - servers = { '2a03:2260:3005:1300::2', '2a03:2260:3005:1300::5' }, - }, - - mesh = { - vxlan = false, - }, - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom13snode01.ffdon.de:20013', - 'dom13snode02.ffdon.de:20013', - }, - }, - bandwidth_limit = { - enabled = false, - ingress = 25000, - egress = 5000, + enabled = false, + ingress = 25000, + egress = 5000, }, }, - + -- autoupdater config autoupdater = { branch = 'stable', @@ -80,8 +37,8 @@ stable = { name = 'stable', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-13/stable/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-13/stable/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/stable/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/stable/sysupgrade', }, good_signatures = 3, pubkeys = { @@ -99,8 +56,8 @@ beta = { name = 'beta', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-13/beta/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-13/beta/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/beta/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/beta/sysupgrade', }, good_signatures = 2, pubkeys = { @@ -113,12 +70,13 @@ 'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath '50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische '24b25027ebe9c76ece1db0e562755f852b35c92e5a68f63f831bb4e6ad7b4bef', -- FFDON-mgk - }, }, + }, + }, experimental = { name = 'experimental', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-13/experimental/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-13/experimental/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/experimental/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/experimental/sysupgrade', }, good_signatures = 1, pubkeys = { diff --git a/domains/15/site.conf b/domains/15/site.conf index 81453f3..4cfa7f7 100644 --- a/domains/15/site.conf +++ b/domains/15/site.conf @@ -1,78 +1,35 @@ { - hostname_prefix = 'ffOet', - site_name = 'Freifunk DON Domäne 15 Oettingen', - site_code = 'ffdond15', - domain_seed = '43d3d22914b83ab94b16dfa1856703c7a40399c17e2c59a11664803f0c9edd0d', - - prefix4 = '10.86.64.0/22', - prefix6 = '2a03:2260:3005:1500::/64', + hostname_prefix = 'ffdon-', + site_name = 'Freifunk Donau-Ries', + site_code = 'ffdon', + default_domain = 'ffdon_oettingen', mesh_on_lan = true, - + -- timezone timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - + -- network ntp services ntp_servers = { '0.de.pool.ntp.org', '1.de.pool.ntp.org', '2.de.pool.ntp.org', '3.de.pool.ntp.org' }, - + -- regulatory domain of your wifi regdom = 'DE', wifi24 = { channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:40:00', - bssid = '02:00:0a:56:40:00', - mcast_rate = 12000, - }, }, wifi5 = { channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:40:00', - bssid = '02:00:0a:56:40:00', - mcast_rate = 12000, - }, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.64.1', - ip6 = '2a03:2260:3005:1500::1', - mac = '02:00:0a:56:40:01', }, - dns = { - cacheentries = 20000, - servers = { '2a03:2260:3005:1500::2', '2a03:2260:3005:1500::5' }, - }, - - mesh = { - vxlan = false, - }, - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom15snode01.ffdon.de:20015', - 'dom15snode02.ffdon.de:20015', - }, - }, - bandwidth_limit = { - enabled = false, - ingress = 25000, - egress = 5000, + enabled = false, + ingress = 25000, + egress = 5000, }, }, - + -- autoupdater config autoupdater = { branch = 'stable', @@ -80,8 +37,8 @@ stable = { name = 'stable', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-15/stable/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-15/stable/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/stable/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/stable/sysupgrade', }, good_signatures = 3, pubkeys = { @@ -99,8 +56,8 @@ beta = { name = 'beta', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-15/beta/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-15/beta/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/beta/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/beta/sysupgrade', }, good_signatures = 2, pubkeys = { @@ -113,12 +70,13 @@ 'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath '50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische '24b25027ebe9c76ece1db0e562755f852b35c92e5a68f63f831bb4e6ad7b4bef', -- FFDON-mgk - }, }, + }, + }, experimental = { name = 'experimental', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-15/experimental/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-15/experimental/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/experimental/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/experimental/sysupgrade', }, good_signatures = 1, pubkeys = { diff --git a/domains/17/site.conf b/domains/17/site.conf index 1c99be1..12de2b8 100644 --- a/domains/17/site.conf +++ b/domains/17/site.conf @@ -1,78 +1,35 @@ { - hostname_prefix = 'ffRai', - site_name = 'Freifunk DON Domäne 17 Rain', - site_code = 'ffdond17', - domain_seed = '1749b2d13b1e9f5e215857c2a2bb6b29c0c0902c39204531fb743644e1866c1f', - - prefix4 = '10.86.72.0/22', - prefix6 = '2a03:2260:3005:1700::/64', + hostname_prefix = 'ffdon-', + site_name = 'Freifunk Donau-Ries', + site_code = 'ffdon', + default_domain = 'ffdon_rain', mesh_on_lan = true, - + -- timezone timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - + -- network ntp services ntp_servers = { '0.de.pool.ntp.org', '1.de.pool.ntp.org', '2.de.pool.ntp.org', '3.de.pool.ntp.org' }, - + -- regulatory domain of your wifi regdom = 'DE', wifi24 = { channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:48:00', - bssid = '02:00:0a:56:48:00', - mcast_rate = 12000, - }, }, wifi5 = { channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:48:00', - bssid = '02:00:0a:56:48:00', - mcast_rate = 12000, - }, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.72.1', - ip6 = '2a03:2260:3005:1700::1', - mac = '02:00:0a:56:48:01', }, - dns = { - cacheentries = 20000, - servers = { '2a03:2260:3005:1700::2', '2a03:2260:3005:1700::5' }, - }, - - mesh = { - vxlan = false, - }, - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom17snode01.ffdon.de:20017', - 'dom17snode02.ffdon.de:20017', - }, - }, - bandwidth_limit = { - enabled = false, - ingress = 25000, - egress = 5000, + enabled = false, + ingress = 25000, + egress = 5000, }, }, - + -- autoupdater config autoupdater = { branch = 'stable', @@ -80,8 +37,8 @@ stable = { name = 'stable', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-17/stable/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-17/stable/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/stable/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/stable/sysupgrade', }, good_signatures = 3, pubkeys = { @@ -99,8 +56,8 @@ beta = { name = 'beta', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-17/beta/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-17/beta/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/beta/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/beta/sysupgrade', }, good_signatures = 2, pubkeys = { @@ -113,12 +70,13 @@ 'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath '50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische '24b25027ebe9c76ece1db0e562755f852b35c92e5a68f63f831bb4e6ad7b4bef', -- FFDON-mgk - }, }, + }, + }, experimental = { name = 'experimental', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-17/experimental/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-17/experimental/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/experimental/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/experimental/sysupgrade', }, good_signatures = 1, pubkeys = { diff --git a/domains/19/site.conf b/domains/19/site.conf index bff9397..38ec095 100644 --- a/domains/19/site.conf +++ b/domains/19/site.conf @@ -1,78 +1,35 @@ { - hostname_prefix = 'ffUml', - site_name = 'Freifunk DON Domäne 19 Umland', - site_code = 'ffdond19', - domain_seed = '5483e62b1bdce04e5787560f08c08b1ff250590ff651c9faba2c2bc5ff5966ea', - - prefix4 = '10.86.80.0/22', - prefix6 = '2a03:2260:3005:1900::/64', + hostname_prefix = 'ffdon-', + site_name = 'Freifunk Donau-Ries', + site_code = 'ffdon', + default_domain = 'ffdon_umland', mesh_on_lan = true, - + -- timezone timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - + -- network ntp services ntp_servers = { '0.de.pool.ntp.org', '1.de.pool.ntp.org', '2.de.pool.ntp.org', '3.de.pool.ntp.org' }, - + -- regulatory domain of your wifi regdom = 'DE', wifi24 = { channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:50:00', - bssid = '02:00:0a:56:50:00', - mcast_rate = 12000, - }, }, wifi5 = { channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - ibss = { - ssid = '02:00:0a:56:50:00', - bssid = '02:00:0a:56:50:00', - mcast_rate = 12000, - }, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.80.1', - ip6 = '2a03:2260:3005:1900::1', - mac = '02:00:0a:56:50:01', }, - dns = { - cacheentries = 20000, - servers = { '2a03:2260:3005:1900::2', '2a03:2260:3005:1900::5' }, - }, - - mesh = { - vxlan = false, - }, - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom19snode01.ffdon.de:20019', - 'dom19snode02.ffdon.de:20019', - }, - }, - bandwidth_limit = { - enabled = false, - ingress = 25000, - egress = 5000, + enabled = false, + ingress = 25000, + egress = 5000, }, }, - + -- autoupdater config autoupdater = { branch = 'stable', @@ -80,8 +37,8 @@ stable = { name = 'stable', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-19/stable/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-19/stable/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/stable/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/stable/sysupgrade', }, good_signatures = 3, pubkeys = { @@ -99,8 +56,8 @@ beta = { name = 'beta', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-19/beta/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-19/beta/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/beta/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/beta/sysupgrade', }, good_signatures = 2, pubkeys = { @@ -113,12 +70,13 @@ 'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath '50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische '24b25027ebe9c76ece1db0e562755f852b35c92e5a68f63f831bb4e6ad7b4bef', -- FFDON-mgk - }, }, + }, + }, experimental = { name = 'experimental', mirrors = { - 'http://1.updates.services.ffdon/ffdonV2/Domaene-19/experimental/sysupgrade', - 'http://firmware2.ffdon.de/ffdonV2/Domaene-19/experimental/sysupgrade', + 'http://1.updates.services.ffdon/ffdonV2/experimental/sysupgrade', + 'http://firmware2.ffdon.de/ffdonV2/experimental/sysupgrade', }, good_signatures = 1, pubkeys = { diff --git a/domains/ffdon_baeumenheim.conf b/domains/ffdon_baeumenheim.conf new file mode 100644 index 0000000..bb0cee8 --- /dev/null +++ b/domains/ffdon_baeumenheim.conf @@ -0,0 +1,53 @@ +{ + domain_names = { + ffdon_baeumenheim = 'Freifunk Donau-Ries Baeumenheim', + }, + domain_seed = '76ac450b2773eacadf163cee1d52992b11cd80f79f6edd049f543288da776194', + + prefix4 = '10.86.40.0/22', + prefix6 = '2a03:2260:3005:900::/64', + + wifi24 = { + channel = 1, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:28:00', + bssid = '02:00:0a:56:28:00', + mcast_rate = 12000, + }, + }, + wifi5 = { + channel = 44, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:28:00', + bssid = '02:00:0a:56:28:00', + mcast_rate = 12000, + }, + }, + + mesh = { + vxlan = false, + }, + + next_node = { + name = { 'knoten' }, + ip4 = '10.86.40.1', + ip6 = '2a03:2260:3005:900::1', + mac = '02:00:0a:56:28:01', + }, + + mesh_vpn = { + mtu = 1364, + tunneldigger = { + brokers = { + 'dom09snode01.ffdon.de:20009', + 'dom09snode02.ffdon.de:20009', + }, + }, + }, +} diff --git a/domains/ffdon_donauwoerth.conf b/domains/ffdon_donauwoerth.conf new file mode 100644 index 0000000..d381c2f --- /dev/null +++ b/domains/ffdon_donauwoerth.conf @@ -0,0 +1,53 @@ +{ + domain_names = { + ffdon_donauwoerth = 'Freifunk Donau-Ries Donauwoerth', + }, + domain_seed = '19628ca4709ecdf2fc2dadb9202a2a41b47b21dfc589d28b5a7e25a81e1e093d', + + prefix4 = '10.86.16.0/22', + prefix6 = '2a03:2260:3005:300::/64', + + wifi24 = { + channel = 1, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:10:00', + bssid = '02:00:0a:56:10:00', + mcast_rate = 12000, + }, + }, + wifi5 = { + channel = 44, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:10:00', + bssid = '02:00:0a:56:10:00', + mcast_rate = 12000, + }, + }, + + mesh = { + vxlan = false, + }, + + next_node = { + name = { 'knoten' }, + ip4 = '10.86.16.1', + ip6 = '2a03:2260:3005:300::1', + mac = '02:00:0a:56:10:01', + }, + + mesh_vpn = { + mtu = 1364, + tunneldigger = { + brokers = { + 'dom03snode01.ffdon.de:20003', + 'dom03snode02.ffdon.de:20003', + }, + }, + }, +} diff --git a/domains/ffdon_harburg.conf b/domains/ffdon_harburg.conf new file mode 100644 index 0000000..637ca8b --- /dev/null +++ b/domains/ffdon_harburg.conf @@ -0,0 +1,53 @@ +{ + domain_names = { + ffdon_harburg = 'Freifunk Donau-Ries Harburg', + }, + domain_seed = '2c3be78ee3ddebbdf247e06f386cdda58b2964fbd064473d5e6b4c138540df24', + + prefix4 = '10.86.56.0/22', + prefix6 = '2a03:2260:3005:1300::/64', + + wifi24 = { + channel = 1, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:38:00', + bssid = '02:00:0a:56:38:00', + mcast_rate = 12000, + }, + }, + wifi5 = { + channel = 44, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:38:00', + bssid = '02:00:0a:56:38:00', + mcast_rate = 12000, + }, + }, + + mesh = { + vxlan = false, + }, + + next_node = { + name = { 'knoten' }, + ip44 = '10.86.56.1', + ip6 = '2a03:2260:3005:1300::1', + mac = '02:00:0a:56:38:01', + }, + + mesh_vpn = { + mtu = 1364, + tunneldigger = { + brokers = { + 'dom13snode01.ffdon.de:20013', + 'dom13snode02.ffdon.de:20013', + }, + }, + }, +} diff --git a/domains/ffdon_monheim.conf b/domains/ffdon_monheim.conf new file mode 100644 index 0000000..f65dc78 --- /dev/null +++ b/domains/ffdon_monheim.conf @@ -0,0 +1,53 @@ +{ + domain_names = { + ffdon_monheim = 'Freifunk Donau-Ries Monheim', + }, + domain_seed = '794b08e76a221a91097597dd4c6092bc1b158748c1a1307cb0b5655b2cbe4b4d', + + prefix4 = '10.86.48.0/22', + prefix6 = '2a03:2260:3005:1100::/64', + + wifi24 = { + channel = 1, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:30:00', + bssid = '02:00:0a:56:30:00', + mcast_rate = 12000, + }, + }, + wifi5 = { + channel = 44, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:30:00', + bssid = '02:00:0a:56:30:00', + mcast_rate = 12000, + }, + }, + + mesh = { + vxlan = false, + }, + + next_node = { + name = { 'knoten' }, + ip4 = '10.86.48.1', + ip6 = '2a03:2260:3005:1100::1', + mac = '02:00:0a:56:30:01', + }, + + mesh_vpn = { + mtu = 1364, + tunneldigger = { + brokers = { + 'dom11snode01.ffdon.de:20011', + 'dom11snode02.ffdon.de:20011', + }, + }, + }, +} diff --git a/domains/ffdon_noerdlingen.conf b/domains/ffdon_noerdlingen.conf new file mode 100644 index 0000000..0ba5b4f --- /dev/null +++ b/domains/ffdon_noerdlingen.conf @@ -0,0 +1,53 @@ +{ + domain_names = { + ffdon_noerdlingen = 'Freifunk Donau-Ries Noerdlingen', + }, + domain_seed = '62a59be11fe1fec41787c6375c48a0e1886a29703af2a08bd3c14ba82e59db31', + + prefix4 = '10.86.24.0/22', + prefix6 = '2a03:2260:3005:500::/64', + + wifi24 = { + channel = 1, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:18:00', + bssid = '02:00:0a:56:18:00', + mcast_rate = 12000, + }, + }, + wifi5 = { + channel = 44, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:18:00', + bssid = '02:00:0a:56:18:00', + mcast_rate = 12000, + }, + }, + + mesh = { + vxlan = false, + }, + + next_node = { + name = { 'knoten' }, + ip4 = '10.86.24.1', + ip6 = '2a03:2260:3005:500::1', + mac = '02:00:0a:56:18:01', + }, + + mesh_vpn = { + mtu = 1364, + tunneldigger = { + brokers = { + 'dom05snode01.ffdon.de:20005', + 'dom05snode02.ffdon.de:20005', + }, + }, + }, +} diff --git a/domains/ffdon_oettingen.conf b/domains/ffdon_oettingen.conf new file mode 100644 index 0000000..7ad874d --- /dev/null +++ b/domains/ffdon_oettingen.conf @@ -0,0 +1,53 @@ +{ + domain_names = { + ffdon_oettingen = 'Freifunk Donau-Ries Oettingen', + }, + domain_seed = '43d3d22914b83ab94b16dfa1856703c7a40399c17e2c59a11664803f0c9edd0d', + + prefix4 = '10.86.64.0/22', + prefix6 = '2a03:2260:3005:1500::/64', + + wifi24 = { + channel = 1, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:40:00', + bssid = '02:00:0a:56:40:00', + mcast_rate = 12000, + }, + }, + wifi5 = { + channel = 44, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:40:00', + bssid = '02:00:0a:56:40:00', + mcast_rate = 12000, + }, + }, + + mesh = { + vxlan = false, + }, + + next_node = { + name = { 'knoten' }, + ip4 = '10.86.64.1', + ip6 = '2a03:2260:3005:1500::1', + mac = '02:00:0a:56:40:01', + }, + + mesh_vpn = { + mtu = 1364, + tunneldigger = { + brokers = { + 'dom15snode01.ffdon.de:20015', + 'dom15snode02.ffdon.de:20015', + }, + }, + }, +} diff --git a/domains/ffdon_rain.conf b/domains/ffdon_rain.conf new file mode 100644 index 0000000..c72408b --- /dev/null +++ b/domains/ffdon_rain.conf @@ -0,0 +1,53 @@ +{ + domain_names = { + ffdon_rain = 'Freifunk Donau-Ries Rain', + }, + domain_seed = '1749b2d13b1e9f5e215857c2a2bb6b29c0c0902c39204531fb743644e1866c1f', + + prefix4 = '10.86.72.0/22', + prefix6 = '2a03:2260:3005:1700::/64', + + wifi24 = { + channel = 1, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:48:00', + bssid = '02:00:0a:56:48:00', + mcast_rate = 12000, + }, + }, + wifi5 = { + channel = 44, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:48:00', + bssid = '02:00:0a:56:48:00', + mcast_rate = 12000, + }, + }, + + mesh = { + vxlan = false, + }, + + next_node = { + name = { 'knoten' }, + ip4 = '10.86.72.1', + ip6 = '2a03:2260:3005:1700::1', + mac = '02:00:0a:56:48:01', + }, + + mesh_vpn = { + mtu = 1364, + tunneldigger = { + brokers = { + 'dom17snode01.ffdon.de:20017', + 'dom17snode02.ffdon.de:20017', + }, + }, + }, +} diff --git a/domains/ffdon_test.conf b/domains/ffdon_test.conf new file mode 100644 index 0000000..8fc6b89 --- /dev/null +++ b/domains/ffdon_test.conf @@ -0,0 +1,53 @@ +{ + domain_names = { + ffdon_test = 'Freifunk Donau-Ries Test' + }, + domain_seed = 'b9d58035a5a2256627a813ee9d10ebdbf53bbac562fddf240c28ed2becf4c0ec', + + prefix4 = '10.86.8.0/22', + prefix6 = '2a03:2260:3005:100::/64', + + wifi24 = { + channel = 1, + ap = { + ssid = 'TEST@Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:08:00', + bssid = '02:00:0a:56:08:00', + mcast_rate = 12000, + }, + }, + wifi5 = { + channel = 44, + ap = { + ssid = 'TEST@Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:08:00', + bssid = '02:00:0a:56:08:00', + mcast_rate = 12000, + }, + }, + + mesh = { + vxlan = false, + }, + + next_node = { + name = { 'knoten' }, + ip4 = '10.86.8.1', + ip6 = '2a03:2260:3005:100::1', + mac = '02:00:0a:56:08:01', + }, + + mesh_vpn = { + mtu = 1364, + tunneldigger = { + brokers = { + 'dom01snode01.ffdon.de:20001', + 'dom01snode02.ffdon.de:20001', + }, + }, + }, +} diff --git a/domains/ffdon_umland.conf b/domains/ffdon_umland.conf new file mode 100644 index 0000000..007d5f8 --- /dev/null +++ b/domains/ffdon_umland.conf @@ -0,0 +1,53 @@ +{ + domain_names = { + ffdon_umland = 'Freifunk Donau-Ries Umland', + }, + domain_seed = '5483e62b1bdce04e5787560f08c08b1ff250590ff651c9faba2c2bc5ff5966ea', + + prefix4 = '10.86.80.0/22', + prefix6 = '2a03:2260:3005:1900::/64', + + wifi24 = { + channel = 1, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:50:00', + bssid = '02:00:0a:56:50:00', + mcast_rate = 12000, + }, + }, + wifi5 = { + channel = 44, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:50:00', + bssid = '02:00:0a:56:50:00', + mcast_rate = 12000, + }, + }, + + mesh = { + vxlan = false, + }, + + next_node = { + name = { 'knoten' }, + ip4 = '10.86.80.1', + ip6 = '2a03:2260:3005:1900::1', + mac = '02:00:0a:56:50:01', + }, + + mesh_vpn = { + mtu = 1364, + tunneldigger = { + brokers = { + 'dom19snode01.ffdon.de:20019', + 'dom19snode02.ffdon.de:20019', + }, + }, + }, +} diff --git a/domains/ffdon_wemding.conf b/domains/ffdon_wemding.conf new file mode 100644 index 0000000..92e2ac2 --- /dev/null +++ b/domains/ffdon_wemding.conf @@ -0,0 +1,53 @@ +{ + domain_names = { + ffdon_wemding = 'Freifunk Donau-Ries Wemding', + }, + domain_seed = 'acae56118dd203a003ac65fce8d63201d8a4db0ef4dc48b8496a6eb365bed28f', + + prefix4 = '10.86.32.0/22', + prefix6 = '2a03:2260:3005:700::/64', + + wifi24 = { + channel = 1, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:20:00', + bssid = '02:00:0a:56:20:00', + mcast_rate = 12000, + }, + }, + wifi5 = { + channel = 44, + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + ibss = { + ssid = '02:00:0a:56:20:00', + bssid = '02:00:0a:56:20:00', + mcast_rate = 12000, + }, + }, + + mesh = { + vxlan = false, + }, + + next_node = { + name = { 'knoten' }, + ip4 = '10.86.32.1', + ip6 = '2a03:2260:3005:700::1', + mac = '02:00:0a:56:20:01', + }, + + mesh_vpn = { + mtu = 1364, + tunneldigger = { + brokers = { + 'dom07snode01.ffdon.de:20007', + 'dom07snode02.ffdon.de:20007', + }, + }, + }, +} diff --git a/domains/shared/i18n/de.po b/domains/shared/i18n/de.po index 74ffb54..5766a4a 100644 --- a/domains/shared/i18n/de.po +++ b/domains/shared/i18n/de.po @@ -16,6 +16,15 @@ msgstr "" "Freifunk-Knoten für das Netz Freifunk Donau-Ries." "Bitte fülle das folgende Formular deinen Vorstellungen entsprechend aus und sende es ab." +msgid "gluon-config-mode:domain" +msgstr "Domäne" + +msgid "gluon-config-mode:domain-select" +msgstr "" +"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten " +"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den " +"Knoten der ausgewählten Domäne verbinden kann." + msgid "gluon-config-mode:novpn" msgstr "" "

Du hast ausgewählt, kein Mesh-VPN " diff --git a/domains/shared/site.mk b/domains/shared/site.mk index ab7b53c..ce306b6 100644 --- a/domains/shared/site.mk +++ b/domains/shared/site.mk @@ -6,7 +6,10 @@ # depending on the combination of features listed GLUON_FEATURES := \ + advancedstats \ autoupdater \ + config-mode-statistics \ + config-mode-domain-select \ ebtables-filter-multicast \ ebtables-filter-ra-dhcp \ ebtables-limit-arp \ @@ -15,39 +18,30 @@ GLUON_FEATURES := \ mesh-vpn-tunneldigger \ radvd \ respondd \ - status-page \ - web-advanced \ - web-wizard \ - web-private-wifi \ - advancedstats \ - config-mode-statistics \ + rfkill-disable \ ssid-changer \ + status-page \ tunneldigger-watchdog \ - rfkill-disable + web-advanced \ + web-private-wifi \ + web-wizard + +## GLUON_MULTIDOMAIN +# Build gluon with multidomain support. + +GLUON_MULTIDOMAIN=1 + ## GLUON_SITE_PACKAGES # Specify additional Gluon/OpenWrt packages to include here; # A minus sign may be prepended to remove a packages from the # selection that would be enabled by default or due to the # chosen feature flags GLUON_SITE_PACKAGES := \ + ffho-autoupdater-wifi-fallback \ + gluon-alfred \ haveged \ - iwinfo \ iptables \ - ffho-autoupdater-wifi-fallback \ - gluon-alfred -#GLUON_SITE_PACKAGES := \ -# gluon-config-mode-autoupdater \ -# gluon-config-mode-contact-info \ -# gluon-config-mode-core \ -# gluon-config-mode-geo-location \ -# gluon-config-mode-hostname \ -# gluon-web-admin \ -# gluon-web-autoupdater \ -# gluon-web-network \ -# gluon-web-private-wifi \ -# gluon-web-wifi-config \ -# gluon-setup-mode \ -# gluon-mesh-vpn-core \ + iwinfo GLUON_PRIORITY ?= 3 GLUON_LANGS ?= de diff --git a/scripts/build.sh b/scripts/build.sh index 9f45efe..a578aa9 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -27,6 +27,8 @@ fi mkdir -p "${gluon_build_dir}/site" cp -av domains/shared/* "${gluon_build_dir}/site/" cp -av "domains/${domain}/"* "${gluon_build_dir}/site/" +mkdir -p "${gluon_build_dir}/site/domains" +cp -av domains/*.conf "${gluon_build_dir}/site/domains/" if [ -d "patches" ]; then