aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrubo77 <github@r.z11.de>2018-11-26 12:44:25 +0100
committerrubo77 <github@r.z11.de>2018-11-26 12:44:25 +0100
commitdbec541a3bc4ae119fbd4446f667e48fb4deeb1b (patch)
treee011ca8640594350cdf553bf76f713eb7692557d
parent3fd8a0af547091795e9a0ebb8fe532c65d1e15fb (diff)
switch to batman 15; move ddhcpd into domain configs; generate new fastd keys for VPNs
-rw-r--r--domains/kiel_zentrum.conf74
-rw-r--r--site.conf16
-rw-r--r--site.mk2
3 files changed, 47 insertions, 45 deletions
diff --git a/domains/kiel_zentrum.conf b/domains/kiel_zentrum.conf
index 971bd74..b6d7deb 100644
--- a/domains/kiel_zentrum.conf
+++ b/domains/kiel_zentrum.conf
@@ -33,6 +33,12 @@
mac = '36:f4:54:fc:e5:11'
},
+ ddhcpd = {
+ enabled = true,
+ range = "10.116.160.0/19",
+ broadcast = "10.116.255.255"
+ },
+
-- Wireless configuration for 2.4 GHz interfaces.
wifi24 = {
channel = 11,
@@ -58,7 +64,7 @@
ssid = 'http://kiel.freifunk.net/',
},
mesh = {
- id = '16:ca:ff:ee:ba:be',
+ id = '64:ca:ff:ee:ba:be',
mcast_rate = 12000,
disabled = false,
},
@@ -67,6 +73,17 @@
mesh = {
-- (vxlan=false is legacy)
vxlan = false,
+ -- Options specific to the batman-adv routing protocol (optional)
+ batman_adv = {
+ -- Gateway selection class (optional)
+ -- The default class 20 is based on the link quality (TQ) only,
+ -- class 1 is calculated from both the TQ and the announced bandwidth
+ -- class 3 -> fast switch connection, chooses the gateway with the best
+ -- link quality but switches to another gateway
+ -- as soon as a better one is found
+ gw_sel_class = 3,
+ routing_algo = 'BATMAN_IV',
+ },
},
mesh_vpn = {
@@ -79,67 +96,68 @@
-- Limit number of connected peers to reduce bandwidth.
limit = 1,
peers = {
+ -- $ for i in $(seq 0 8); do echo ffki_vpn$i; fastd --generate-key 2>/dev/null; done
ffki_vpn0 = {
- key = '7a01772ff2351ce7ad3e305da58ba96178997cadb23fcd8c527e88b2fb677528',
+ key = '7d0f990707f842ec2dc05392d1153b8c98c90decca2adb1fd08aaee6da832b4b',
remotes = {
- 'ipv6 "vpn0.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn0.freifunk.in-kiel.de" port 11235'
+ 'ipv6 "vpn0.freifunk.in-kiel.de" port 10000',
+ 'ipv4 "vpn0.freifunk.in-kiel.de" port 10000',
},
},
ffki_vpn1 = {
- key = '65db8bff947e7c02ef7e152e73fb17c39ee9cfea91d047cb7a063ecb1eb7dd88',
+ key = 'c12ccca4519dcce8f9cd1c785f30983e02679d99be30dc8ceae859e589ba68ae',
remotes = {
- 'ipv6 "vpn1.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn1.freifunk.in-kiel.de" port 11235'
+ 'ipv6 "vpn1.freifunk.in-kiel.de" port 10000',
+ 'ipv4 "vpn1.freifunk.in-kiel.de" port 10000',
},
},
ffki_vpn2 = {
- key = 'fa400de81fc9f53127a4e60980c9756af372161c01ecbc7574fe115cf6434821',
+ key = '560f72afecc6da647cb30912f3c658bbe2ad58bd6e5473d959104d9af7b6bc58',
remotes = {
- 'ipv6 "vpn2.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn2.freifunk.in-kiel.de" port 11235'
+ 'ipv6 "vpn2.freifunk.in-kiel.de" port 10000',
+ 'ipv4 "vpn2.freifunk.in-kiel.de" port 10000',
},
},
ffki_vpn3 = {
- key = 'd93050db0bf01b37ea9fda6d0977c07dcac598d244f8f7ceff8dc903b28c6462',
+ key = '94829d3d9b6396264e03e42520d5fc1d74cc8dbfee15984b674e63e5bd72e0eb',
remotes = {
- 'ipv6 "vpn3.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn3.freifunk.in-kiel.de" port 11235'
+ 'ipv6 "vpn3.freifunk.in-kiel.de" port 10000',
+ 'ipv4 "vpn3.freifunk.in-kiel.de" port 10000',
},
},
ffki_vpn4 = {
- key = 'ad853e5848ad5c2a149a93f156215e4b6eafed3ef16f7b70b80f33677bda8aa0',
+ key = '525d4879c70ed05cda2e9fdbdb48d0bba317b4a0d851c83202ea6fc927ca29db',
remotes = {
- 'ipv6 "vpn4.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn4.freifunk.in-kiel.de" port 11235'
+ 'ipv6 "vpn4.freifunk.in-kiel.de" port 10000',
+ 'ipv4 "vpn4.freifunk.in-kiel.de" port 10000',
},
},
ffki_vpn5 = {
- key = '692f620fbc01c3dd69d3126c76a258854bd2de6ea6a9f6889620c78f98065c8c',
+ key = '5f7b65b030111c1cfe4a2de4359d88c887d771345311b225e2a992a5660fe800',
remotes = {
- 'ipv6 "vpn5.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn5.freifunk.in-kiel.de" port 11235'
+ 'ipv6 "vpn5.freifunk.in-kiel.de" port 10000',
+ 'ipv4 "vpn5.freifunk.in-kiel.de" port 10000',
},
},
ffki_vpn6 = {
- key = '53a1b531ec6a94337601e8ac5345670bc82fac156200e313dda90ca50255d018',
+ key = 'f40d8c5a2ef99aba47742d65d061b84f8696691ae84b6d9234a0915d9e8d6268',
remotes = {
- 'ipv6 "vpn6.freifunk.in-kiel.de" port 11235',
- 'ipv4 "vpn6.freifunk.in-kiel.de" port 11235'
+ 'ipv6 "vpn6.freifunk.in-kiel.de" port 10000',
+ 'ipv4 "vpn6.freifunk.in-kiel.de" port 10000',
},
},
ffki_vpn7 = {
- key = '3845a2d0559776beb27be2044e4d9a9913a7743f9b0e1dcd3ebacf50545342ec',
+ key = '7a05b3ef82a30cbd2ea7996eb214c885b1bb1133e6510ef4e73df167f741e78b',
remotes = {
- 'ipv6 "vpn7.freifunk.toppoint.de" port 11235',
- 'ipv4 "vpn7.freifunk.toppoint.de" port 11235'
+ 'ipv6 "vpn7.freifunk.in-kiel.de" port 10000',
+ 'ipv4 "vpn7.freifunk.in-kiel.de" port 10000',
},
},
ffki_vpn8 = {
- key = 'd36c8a48f279bdcc0b8de66c232989f12faaf4bf490ba6bba6bd01526083601e',
+ key = 'de0a4ec6a6e162094b74a9cd3e783be7dd5e5b2b1c04246dd9272c4a59422409',
remotes = {
- 'ipv6 "vpn8.ffki.de" port 11235',
- 'ipv4 "vpn8.ffki.de" port 11235'
+ 'ipv6 "vpn8.freifunk.in-kiel.de" port 10000',
+ 'ipv4 "vpn8.freifunk.in-kiel.de" port 10000',
},
},
},
diff --git a/site.conf b/site.conf
index 11ef736..b99872a 100644
--- a/site.conf
+++ b/site.conf
@@ -41,12 +41,6 @@
},
},
- ddhcpd = {
- enabled = true,
- range = "10.116.160.0/19",
- broadcast = "10.116.255.255"
- },
-
-- Wireless configuration for 2.4 GHz interfaces.
wifi24 = {
-- List of supported wifi rates (optional)
@@ -76,16 +70,6 @@
-- Options specific to routing protocols (optional)
mesh = {
filter_membership_reports = true,
- -- Options specific to the batman-adv routing protocol (optional)
- batman_adv = {
- -- Gateway selection class (optional)
- -- The default class 20 is based on the link quality (TQ) only,
- -- class 1 is calculated from both the TQ and the announced bandwidth
- -- class 3 -> fast switch connection, chooses the gateway with the best
- -- link quality but switches to another gateway
- -- as soon as a better one is found
- gw_sel_class = 3,
- },
},
-- optional; Enables the mesh on the WAN port (true or false).
diff --git a/site.mk b/site.mk
index dc30ac3..e1935c4 100644
--- a/site.mk
+++ b/site.mk
@@ -31,7 +31,7 @@ GLUON_FEATURES := \
ebtables-limit-arp \
ebtables-filter-multicast \
ebtables-filter-ra-dhcp \
- mesh-batman-adv-14 \
+ mesh-batman-adv-15 \
mesh-vpn-fastd \
radvd \
radv-filterd \