From 3bb28a7ffa7f81468cab38294f38bb218cae1b28 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 12 Aug 2016 23:52:21 +0200 Subject: [PATCH] fix umland site configs --- extra/ffbay_dah.conf | 51 ++++++++++++++++++------------------------ extra/ffbay_ebe.conf | 51 ++++++++++++++++++------------------------ extra/ffbay_ed.conf | 51 ++++++++++++++++++------------------------ extra/ffbay_ffb.conf | 51 ++++++++++++++++++------------------------ extra/ffbay_fs.conf | 51 ++++++++++++++++++------------------------ extra/ffbay_sta.conf | 51 ++++++++++++++++++------------------------ extra/ffbay_tol.conf | 51 ++++++++++++++++++------------------------ util/make_siteconfs.sh | 4 ++-- 8 files changed, 156 insertions(+), 205 deletions(-) diff --git a/extra/ffbay_dah.conf b/extra/ffbay_dah.conf index 3dcfab0..ec966b0 100644 --- a/extra/ffbay_dah.conf +++ b/extra/ffbay_dah.conf @@ -23,12 +23,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -39,12 +39,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -68,39 +68,32 @@ backbone = { limit = 1, peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', remotes = { - '"gw01.ffmuc.net" port 10049', - '"gw01.freifunk-muenchen.de" port 10049', + '"gwu01.ffmuc.net" port 10049', + '"gwu01.freifunk-muenchen.de" port 10049', }, }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', remotes = { - '"gw02.ffmuc.net" port 10049', - '"gw02.freifunk-muenchen.de" port 10049', + '"gwu02.ffmuc.net" port 10049', + '"gwu02.freifunk-muenchen.de" port 10049', }, }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', remotes = { - '"gw03.ffmuc.net" port 10049', - '"gw03.freifunk-muenchen.de" port 10049', + '"gwu03.ffmuc.net" port 10049', + '"gwu03.freifunk-muenchen.de" port 10049', }, }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', remotes = { - '"gw04.ffmuc.net" port 10049', - '"gw04.freifunk-muenchen.de" port 10049', - }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10049', - '"gw05.freifunk-muenchen.de" port 10049', + '"gwu04.ffmuc.net" port 10049', + '"gwu04.freifunk-muenchen.de" port 10049', }, }, }, diff --git a/extra/ffbay_ebe.conf b/extra/ffbay_ebe.conf index 152af64..4f3fcd6 100644 --- a/extra/ffbay_ebe.conf +++ b/extra/ffbay_ebe.conf @@ -23,12 +23,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -39,12 +39,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -68,39 +68,32 @@ backbone = { limit = 1, peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', remotes = { - '"gw01.ffmuc.net" port 10062', - '"gw01.freifunk-muenchen.de" port 10062', + '"gwu01.ffmuc.net" port 10062', + '"gwu01.freifunk-muenchen.de" port 10062', }, }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', remotes = { - '"gw02.ffmuc.net" port 10062', - '"gw02.freifunk-muenchen.de" port 10062', + '"gwu02.ffmuc.net" port 10062', + '"gwu02.freifunk-muenchen.de" port 10062', }, }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', remotes = { - '"gw03.ffmuc.net" port 10062', - '"gw03.freifunk-muenchen.de" port 10062', + '"gwu03.ffmuc.net" port 10062', + '"gwu03.freifunk-muenchen.de" port 10062', }, }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', remotes = { - '"gw04.ffmuc.net" port 10062', - '"gw04.freifunk-muenchen.de" port 10062', - }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10062', - '"gw05.freifunk-muenchen.de" port 10062', + '"gwu04.ffmuc.net" port 10062', + '"gwu04.freifunk-muenchen.de" port 10062', }, }, }, diff --git a/extra/ffbay_ed.conf b/extra/ffbay_ed.conf index 8bb1bdf..324a54f 100644 --- a/extra/ffbay_ed.conf +++ b/extra/ffbay_ed.conf @@ -23,12 +23,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -39,12 +39,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -68,39 +68,32 @@ backbone = { limit = 1, peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', remotes = { - '"gw01.ffmuc.net" port 10061', - '"gw01.freifunk-muenchen.de" port 10061', + '"gwu01.ffmuc.net" port 10061', + '"gwu01.freifunk-muenchen.de" port 10061', }, }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', remotes = { - '"gw02.ffmuc.net" port 10061', - '"gw02.freifunk-muenchen.de" port 10061', + '"gwu02.ffmuc.net" port 10061', + '"gwu02.freifunk-muenchen.de" port 10061', }, }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', remotes = { - '"gw03.ffmuc.net" port 10061', - '"gw03.freifunk-muenchen.de" port 10061', + '"gwu03.ffmuc.net" port 10061', + '"gwu03.freifunk-muenchen.de" port 10061', }, }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', remotes = { - '"gw04.ffmuc.net" port 10061', - '"gw04.freifunk-muenchen.de" port 10061', - }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10061', - '"gw05.freifunk-muenchen.de" port 10061', + '"gwu04.ffmuc.net" port 10061', + '"gwu04.freifunk-muenchen.de" port 10061', }, }, }, diff --git a/extra/ffbay_ffb.conf b/extra/ffbay_ffb.conf index 73123c7..6910953 100644 --- a/extra/ffbay_ffb.conf +++ b/extra/ffbay_ffb.conf @@ -23,12 +23,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -39,12 +39,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -68,39 +68,32 @@ backbone = { limit = 1, peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', remotes = { - '"gw01.ffmuc.net" port 10048', - '"gw01.freifunk-muenchen.de" port 10048', + '"gwu01.ffmuc.net" port 10048', + '"gwu01.freifunk-muenchen.de" port 10048', }, }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', remotes = { - '"gw02.ffmuc.net" port 10048', - '"gw02.freifunk-muenchen.de" port 10048', + '"gwu02.ffmuc.net" port 10048', + '"gwu02.freifunk-muenchen.de" port 10048', }, }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', remotes = { - '"gw03.ffmuc.net" port 10048', - '"gw03.freifunk-muenchen.de" port 10048', + '"gwu03.ffmuc.net" port 10048', + '"gwu03.freifunk-muenchen.de" port 10048', }, }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', remotes = { - '"gw04.ffmuc.net" port 10048', - '"gw04.freifunk-muenchen.de" port 10048', - }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10048', - '"gw05.freifunk-muenchen.de" port 10048', + '"gwu04.ffmuc.net" port 10048', + '"gwu04.freifunk-muenchen.de" port 10048', }, }, }, diff --git a/extra/ffbay_fs.conf b/extra/ffbay_fs.conf index e6a782d..6d10286 100644 --- a/extra/ffbay_fs.conf +++ b/extra/ffbay_fs.conf @@ -23,12 +23,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -39,12 +39,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -68,39 +68,32 @@ backbone = { limit = 1, peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', remotes = { - '"gw01.ffmuc.net" port 10050', - '"gw01.freifunk-muenchen.de" port 10050', + '"gwu01.ffmuc.net" port 10050', + '"gwu01.freifunk-muenchen.de" port 10050', }, }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', remotes = { - '"gw02.ffmuc.net" port 10050', - '"gw02.freifunk-muenchen.de" port 10050', + '"gwu02.ffmuc.net" port 10050', + '"gwu02.freifunk-muenchen.de" port 10050', }, }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', remotes = { - '"gw03.ffmuc.net" port 10050', - '"gw03.freifunk-muenchen.de" port 10050', + '"gwu03.ffmuc.net" port 10050', + '"gwu03.freifunk-muenchen.de" port 10050', }, }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', remotes = { - '"gw04.ffmuc.net" port 10050', - '"gw04.freifunk-muenchen.de" port 10050', - }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10050', - '"gw05.freifunk-muenchen.de" port 10050', + '"gwu04.ffmuc.net" port 10050', + '"gwu04.freifunk-muenchen.de" port 10050', }, }, }, diff --git a/extra/ffbay_sta.conf b/extra/ffbay_sta.conf index cdd98b5..07b382d 100644 --- a/extra/ffbay_sta.conf +++ b/extra/ffbay_sta.conf @@ -23,12 +23,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -39,12 +39,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -68,39 +68,32 @@ backbone = { limit = 1, peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', remotes = { - '"gw01.ffmuc.net" port 10047', - '"gw01.freifunk-muenchen.de" port 10047', + '"gwu01.ffmuc.net" port 10047', + '"gwu01.freifunk-muenchen.de" port 10047', }, }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', remotes = { - '"gw02.ffmuc.net" port 10047', - '"gw02.freifunk-muenchen.de" port 10047', + '"gwu02.ffmuc.net" port 10047', + '"gwu02.freifunk-muenchen.de" port 10047', }, }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', remotes = { - '"gw03.ffmuc.net" port 10047', - '"gw03.freifunk-muenchen.de" port 10047', + '"gwu03.ffmuc.net" port 10047', + '"gwu03.freifunk-muenchen.de" port 10047', }, }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', remotes = { - '"gw04.ffmuc.net" port 10047', - '"gw04.freifunk-muenchen.de" port 10047', - }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10047', - '"gw05.freifunk-muenchen.de" port 10047', + '"gwu04.ffmuc.net" port 10047', + '"gwu04.freifunk-muenchen.de" port 10047', }, }, }, diff --git a/extra/ffbay_tol.conf b/extra/ffbay_tol.conf index 2b6a051..738a04d 100644 --- a/extra/ffbay_tol.conf +++ b/extra/ffbay_tol.conf @@ -23,12 +23,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -39,12 +39,12 @@ ssid = 'muenchen.freifunk.net', }, --mesh = { - -- id = 'ffmuc-mesh', + -- id = 'ffmuc-umland-mesh', -- mcast_rate = 12000, --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', + ssid = 'mesh.ffmuc.umland', + bssid = '02:0E:8E:1E:61:19', mcast_rate = 12000, }, }, @@ -68,39 +68,32 @@ backbone = { limit = 1, peers = { - gw01 = { - key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', remotes = { - '"gw01.ffmuc.net" port 10063', - '"gw01.freifunk-muenchen.de" port 10063', + '"gwu01.ffmuc.net" port 10063', + '"gwu01.freifunk-muenchen.de" port 10063', }, }, - gw02 = { - key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', remotes = { - '"gw02.ffmuc.net" port 10063', - '"gw02.freifunk-muenchen.de" port 10063', + '"gwu02.ffmuc.net" port 10063', + '"gwu02.freifunk-muenchen.de" port 10063', }, }, - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', remotes = { - '"gw03.ffmuc.net" port 10063', - '"gw03.freifunk-muenchen.de" port 10063', + '"gwu03.ffmuc.net" port 10063', + '"gwu03.freifunk-muenchen.de" port 10063', }, }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', remotes = { - '"gw04.ffmuc.net" port 10063', - '"gw04.freifunk-muenchen.de" port 10063', - }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - '"gw05.ffmuc.net" port 10063', - '"gw05.freifunk-muenchen.de" port 10063', + '"gwu04.ffmuc.net" port 10063', + '"gwu04.freifunk-muenchen.de" port 10063', }, }, }, diff --git a/util/make_siteconfs.sh b/util/make_siteconfs.sh index e401c7c..ac33729 100755 --- a/util/make_siteconfs.sh +++ b/util/make_siteconfs.sh @@ -4,8 +4,8 @@ cat makefile_prefix > new/Makefile-site-select -cat stadtteile_idx.txt|grep -e '^[^#]'|grep -v LK_|while IFS=, read nr id desc port prefix4; do cp ../extra/ffmuc.conf new/$id.conf; done -cat stadtteile_idx.txt|grep -e '^[^#]'|grep LK_|while IFS=, read nr id desc port prefix4; do cp ../extra/ffmuc_umland.conf new/$id.conf; done +cat stadtteile_idx.txt|grep -e '^[^#]'|grep ffmuc|while IFS=, read nr id desc port prefix4; do cp ../extra/ffmuc.conf new/$id.conf; done +cat stadtteile_idx.txt|grep -e '^[^#]'|grep ffbay|while IFS=, read nr id desc port prefix4; do cp ../extra/ffmuc_umland.conf new/$id.conf; done cat stadtteile_idx.txt | grep -e '^[^#]' \ | while IFS=, read nr id desc seg_id port prefix4 prefix6 next_node4 next_node6; do (