From 044ddfacd5718b0b41c4f607c92a47364f7491c1 Mon Sep 17 00:00:00 2001
From: poldy79 <leonard@penzer.de>
Date: Sat, 2 Jan 2016 22:42:27 +0100
Subject: [PATCH] Added multiple remotes per GW for segmentation
---
site.conf | 130 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 115 insertions(+), 15 deletions(-)
diff --git a/site.conf b/site.conf
index 7904e9ba1..50911f9ef 100644
--- a/site.conf
+++ b/site.conf
@@ -4,7 +4,7 @@
site_code = 'ffs',
opkg = {
- openwrt = 'http://[fd21:b4dc:4b1e::a38:1]/openwrt/barrier_breaker/14.07/%S/packages',
+ openwrt = 'http://[fd21:b4dc:4b00::a38:1]/openwrt/barrier_breaker/14.07/%S/packages',
},
prefix4 = '172.21.0.0/18',
@@ -13,7 +13,7 @@
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {
- 'fd21:b4dc:4b1e::a38:1', -- gw01
+ 'fd21:b4dc:4b00::a38:1', -- gw01
},
regdom = 'DE',
@@ -61,43 +61,143 @@
peers = {
gw01 = {
key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
- remotes = {'"gw01.freifunk-stuttgart.de" port 10037'},
+ remotes = {
+ '"gw01.freifunk-stuttgart.de" port 10037',
+ '"gw01.freifunk-stuttgart.de" port 10041',
+ '"gw01.freifunk-stuttgart.de" port 10042',
+ '"gw01.freifunk-stuttgart.de" port 10043',
+ '"gw01.freifunk-stuttgart.de" port 10044',
+ '"gw01.freifunk-stuttgart.de" port 10045',
+ '"gw01.freifunk-stuttgart.de" port 10046',
+ '"gw01.freifunk-stuttgart.de" port 10047',
+ '"gw01.freifunk-stuttgart.de" port 10048'
+ },
},
gw02 = {
key = 'b694b4646f4fa7cb027f3786993c6c8b9062d1357fa7257bd3210706cffc565a',
- remotes = {'"gw02.freifunk-stuttgart.de" port 10037'},
+ remotes = {
+ '"gw02.freifunk-stuttgart.de" port 10037',
+ '"gw02.freifunk-stuttgart.de" port 10041',
+ '"gw02.freifunk-stuttgart.de" port 10042',
+ '"gw02.freifunk-stuttgart.de" port 10043',
+ '"gw02.freifunk-stuttgart.de" port 10044',
+ '"gw02.freifunk-stuttgart.de" port 10045',
+ '"gw02.freifunk-stuttgart.de" port 10046',
+ '"gw02.freifunk-stuttgart.de" port 10047',
+ '"gw02.freifunk-stuttgart.de" port 10048'
+ },
},
gw03 = {
key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
- remotes = {'"gw03.freifunk-stuttgart.de" port 10037'},
+ remotes = {
+ '"gw03.freifunk-stuttgart.de" port 10037',
+ '"gw03.freifunk-stuttgart.de" port 10041',
+ '"gw03.freifunk-stuttgart.de" port 10042',
+ '"gw03.freifunk-stuttgart.de" port 10043',
+ '"gw03.freifunk-stuttgart.de" port 10044',
+ '"gw03.freifunk-stuttgart.de" port 10045',
+ '"gw03.freifunk-stuttgart.de" port 10046',
+ '"gw03.freifunk-stuttgart.de" port 10047',
+ '"gw03.freifunk-stuttgart.de" port 10048'
+ },
},
gw04 = {
key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
- remotes = {'"gw04.freifunk-stuttgart.de" port 10037'},
+ remotes = {
+ '"gw04.freifunk-stuttgart.de" port 10037',
+ '"gw04.freifunk-stuttgart.de" port 10041',
+ '"gw04.freifunk-stuttgart.de" port 10042',
+ '"gw04.freifunk-stuttgart.de" port 10043',
+ '"gw04.freifunk-stuttgart.de" port 10044',
+ '"gw04.freifunk-stuttgart.de" port 10045',
+ '"gw04.freifunk-stuttgart.de" port 10046',
+ '"gw04.freifunk-stuttgart.de" port 10047',
+ '"gw04.freifunk-stuttgart.de" port 10048'
+ },
},
gw05 = {
key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
- remotes = {'"gw05.freifunk-stuttgart.de" port 10037'},
+ remotes = {
+ '"gw05.freifunk-stuttgart.de" port 10037',
+ '"gw05.freifunk-stuttgart.de" port 10041',
+ '"gw05.freifunk-stuttgart.de" port 10042',
+ '"gw05.freifunk-stuttgart.de" port 10043',
+ '"gw05.freifunk-stuttgart.de" port 10044',
+ '"gw05.freifunk-stuttgart.de" port 10045',
+ '"gw05.freifunk-stuttgart.de" port 10046',
+ '"gw05.freifunk-stuttgart.de" port 10047',
+ '"gw05.freifunk-stuttgart.de" port 10048'
+ },
},
gw06 = {
key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
- remotes = {'"gw06.freifunk-stuttgart.de" port 10037'},
+ remotes = {
+ '"gw06.freifunk-stuttgart.de" port 10037',
+ '"gw06.freifunk-stuttgart.de" port 10041',
+ '"gw06.freifunk-stuttgart.de" port 10042',
+ '"gw06.freifunk-stuttgart.de" port 10043',
+ '"gw06.freifunk-stuttgart.de" port 10044',
+ '"gw06.freifunk-stuttgart.de" port 10045',
+ '"gw06.freifunk-stuttgart.de" port 10046',
+ '"gw06.freifunk-stuttgart.de" port 10047',
+ '"gw06.freifunk-stuttgart.de" port 10048'
+ },
},
gw07 = {
key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
- remotes = {'"gw07.freifunk-stuttgart.de" port 10037'},
+ remotes = {
+ '"gw07.freifunk-stuttgart.de" port 10037',
+ '"gw07.freifunk-stuttgart.de" port 10041',
+ '"gw07.freifunk-stuttgart.de" port 10042',
+ '"gw07.freifunk-stuttgart.de" port 10043',
+ '"gw07.freifunk-stuttgart.de" port 10044',
+ '"gw07.freifunk-stuttgart.de" port 10045',
+ '"gw07.freifunk-stuttgart.de" port 10046',
+ '"gw07.freifunk-stuttgart.de" port 10047',
+ '"gw07.freifunk-stuttgart.de" port 10048'
+ },
},
gw08 = {
key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
- remotes = {'"gw08.freifunk-stuttgart.de" port 10037'},
+ remotes = {
+ '"gw08.freifunk-stuttgart.de" port 10037',
+ '"gw08.freifunk-stuttgart.de" port 10041',
+ '"gw08.freifunk-stuttgart.de" port 10042',
+ '"gw08.freifunk-stuttgart.de" port 10043',
+ '"gw08.freifunk-stuttgart.de" port 10044',
+ '"gw08.freifunk-stuttgart.de" port 10045',
+ '"gw08.freifunk-stuttgart.de" port 10046',
+ '"gw08.freifunk-stuttgart.de" port 10047',
+ '"gw08.freifunk-stuttgart.de" port 10048'
+ },
},
gw09 = {
key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
- remotes = {'"gw09.freifunk-stuttgart.de" port 10037'},
+ remotes = {
+ '"gw09.freifunk-stuttgart.de" port 10037',
+ '"gw09.freifunk-stuttgart.de" port 10041',
+ '"gw09.freifunk-stuttgart.de" port 10042',
+ '"gw09.freifunk-stuttgart.de" port 10043',
+ '"gw09.freifunk-stuttgart.de" port 10044',
+ '"gw09.freifunk-stuttgart.de" port 10045',
+ '"gw09.freifunk-stuttgart.de" port 10046',
+ '"gw09.freifunk-stuttgart.de" port 10047',
+ '"gw09.freifunk-stuttgart.de" port 10048'
+ },
},
gw10 = {
key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
- remotes = {'"gw10.freifunk-stuttgart.de" port 10037'},
+ remotes = {
+ '"gw10.freifunk-stuttgart.de" port 10037',
+ '"gw10.freifunk-stuttgart.de" port 10041',
+ '"gw10.freifunk-stuttgart.de" port 10042',
+ '"gw10.freifunk-stuttgart.de" port 10043',
+ '"gw10.freifunk-stuttgart.de" port 10044',
+ '"gw10.freifunk-stuttgart.de" port 10045',
+ '"gw10.freifunk-stuttgart.de" port 10046',
+ '"gw10.freifunk-stuttgart.de" port 10047',
+ '"gw10.freifunk-stuttgart.de" port 10048'
+ },
},
},
},
@@ -118,7 +218,7 @@
stable = {
name = 'stable',
mirrors = {
- 'http://[fd21:b4dc:4b1e::a38:1]/gluon/stable/sysupgrade', -- gluongw
+ 'http://[fd21:b4dc:4b00::a38:1]/gluon/stable/sysupgrade', -- gluongw
},
good_signatures = 2,
pubkeys = {
@@ -130,7 +230,7 @@
beta = {
name = 'beta',
mirrors = {
- 'http://[fd21:b4dc:4b1e::a38:1]/gluon/beta/sysupgrade', -- gluongw
+ 'http://[fd21:b4dc:4b00::a38:1]/gluon/beta/sysupgrade', -- gluongw
},
good_signatures = 1,
pubkeys = {
@@ -142,7 +242,7 @@
nightly = {
name = 'nightly',
mirrors = {
- 'http://[fd21:b4dc:4b1e::a38:1]/gluon/nightly/sysupgrade', -- gluongw
+ 'http://[fd21:b4dc:4b00::a38:1]/gluon/nightly/sysupgrade', -- gluongw
},
good_signatures = 1,
pubkeys = {
--
GitLab