From fc857f0852479c9fde762d005d7036cd806c20bd Mon Sep 17 00:00:00 2001 From: Bastian Date: Sat, 20 Jan 2018 19:21:30 +0100 Subject: [PATCH] re-enable v6, remove ancient ffmuc packages --- Makefile | 2 +- domains/ffrgb_cty.conf | 24 ++++++++++++------------ domains/ffrgb_tst.conf | 22 +++++++++++----------- domains/ffrgb_uml.conf | 24 ++++++++++++------------ site.mk | 2 -- 5 files changed, 36 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index 3fccd4a..f14b576 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ ar71xx-generic \ - ar71xx-tiny \ + ar71xx-tiny #\ ar71xx-nand \ brcm2708-bcm2708 \ brcm2708-bcm2709 \ diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf index 363d82e..8dea221 100644 --- a/domains/ffrgb_cty.conf +++ b/domains/ffrgb_cty.conf @@ -61,12 +61,12 @@ gwpri = { --[[ primary ]] key = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd', remotes = { - 'ipv4 "gw11.ffrgb.net" port 10010', - 'ipv4 "gw11.ffrgb.net" port 10011', - 'ipv4 "gw11.ffrgb.net" port 10012', - 'ipv4 "gw11.regensburg.freifunk.net" port 10010', - 'ipv4 "gw11.regensburg.freifunk.net" port 10011', - 'ipv4 "gw11.regensburg.freifunk.net" port 10012', + '"gw11.ffrgb.net" port 10010', + '"gw11.ffrgb.net" port 10011', + '"gw11.ffrgb.net" port 10012', + '"gw11.regensburg.freifunk.net" port 10010', + '"gw11.regensburg.freifunk.net" port 10011', + '"gw11.regensburg.freifunk.net" port 10012', 'ipv4 "185.53.218.131" port 10010', 'ipv4 "185.53.218.131" port 10011', 'ipv4 "185.53.218.131" port 10012', @@ -75,12 +75,12 @@ gwsec = { --[[ coldstandby ]] key = '0000000000000000000000000000000000000000000000000000000000000000', remotes = { - 'ipv4 "gw12.ffrgb.net" port 10010', - 'ipv4 "gw12.ffrgb.net" port 10012', - 'ipv4 "gw12.ffrgb.net" port 10011', - 'ipv4 "gw12.regensburg.freifunk.net" port 10010', - 'ipv4 "gw12.regensburg.freifunk.net" port 10011', - 'ipv4 "gw12.regensburg.freifunk.net" port 10012', + '"gw12.ffrgb.net" port 10010', + '"gw12.ffrgb.net" port 10012', + '"gw12.ffrgb.net" port 10011', + '"gw12.regensburg.freifunk.net" port 10010', + '"gw12.regensburg.freifunk.net" port 10011', + '"gw12.regensburg.freifunk.net" port 10012', }, }, }, diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf index 895dd80..54b1178 100644 --- a/domains/ffrgb_tst.conf +++ b/domains/ffrgb_tst.conf @@ -62,11 +62,11 @@ gwpri = { --[[ primary ]] key = '377e0246271bfbf4c99c2d156ee0eb77c16bb5629841fde507cfab6760162b61', remotes = { - 'ipv4 "gw31.ffrgb.net" port 10030', - 'ipv4 "gw31.ffrgb.net" port 10031', - 'ipv4 "gw31.ffrgb.net" port 10032', - 'ipv4 "gw31.regensburg.freifunk.net" port 10030', - 'ipv4 "gw31.regensburg.freifunk.net" port 10031', + '"gw31.ffrgb.net" port 10030', + '"gw31.ffrgb.net" port 10031', + '"gw31.ffrgb.net" port 10032', + '"gw31.regensburg.freifunk.net" port 10030', + '"gw31.regensburg.freifunk.net" port 10031', 'ipv4 "gw31.regensburg.freifunk.net" port 10032', 'ipv4 "185.53.218.133" port 10030', 'ipv4 "185.53.218.133" port 10031', @@ -76,12 +76,12 @@ gwsec = { --[[ coldstandby ]] key = '0000000000000000000000000000000000000000000000000000000000000000', remotes = { - 'ipv4 "gw32.ffrgb.net" port 10030', - 'ipv4 "gw32.ffrgb.net" port 10031', - 'ipv4 "gw32.ffrgb.net" port 10032', - 'ipv4 "gw32.regensburg.freifunk.net" port 10030', - 'ipv4 "gw32.regensburg.freifunk.net" port 10031', - 'ipv4 "gw32.regensburg.freifunk.net" port 10032', + '"gw32.ffrgb.net" port 10030', + '"gw32.ffrgb.net" port 10031', + '"gw32.ffrgb.net" port 10032', + '"gw32.regensburg.freifunk.net" port 10030', + '"gw32.regensburg.freifunk.net" port 10031', + '"gw32.regensburg.freifunk.net" port 10032', }, }, }, diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf index 389158c..6bdf301 100644 --- a/domains/ffrgb_uml.conf +++ b/domains/ffrgb_uml.conf @@ -61,12 +61,12 @@ gwpri = { --[[ primary ]] key = '0dd861f1725bb5562f96fec8a906440c1965d1b1f8a88663dea834e523d788ea', remotes = { - 'ipv4 "gw21.ffrgb.net" port 10020', - 'ipv4 "gw21.ffrgb.net" port 10021', - 'ipv4 "gw21.ffrgb.net" port 10022', - 'ipv4 "gw21.regensburg.freifunk.net" port 10020', - 'ipv4 "gw21.regensburg.freifunk.net" port 10021', - 'ipv4 "gw21.regensburg.freifunk.net" port 10022', + '"gw21.ffrgb.net" port 10020', + '"gw21.ffrgb.net" port 10021', + '"gw21.ffrgb.net" port 10022', + '"gw21.regensburg.freifunk.net" port 10020', + '"gw21.regensburg.freifunk.net" port 10021', + '"gw21.regensburg.freifunk.net" port 10022', 'ipv4 "185.53.218.132" port 10020', 'ipv4 "185.53.218.132" port 10021', 'ipv4 "185.53.218.132" port 10022', @@ -75,12 +75,12 @@ gwsec = { --[[ coldstandby ]] key = '0000000000000000000000000000000000000000000000000000000000000000', remotes = { - 'ipv4 "gw22.ffrgb.net" port 10020', - 'ipv4 "gw22.ffrgb.net" port 10021', - 'ipv4 "gw22.ffrgb.net" port 10022', - 'ipv4 "gw22.regensburg.freifunk.net" port 10020', - 'ipv4 "gw22.regensburg.freifunk.net" port 10021', - 'ipv4 "gw22.regensburg.freifunk.net" port 10022', + '"gw22.ffrgb.net" port 10020', + '"gw22.ffrgb.net" port 10021', + '"gw22.ffrgb.net" port 10022', + '"gw22.regensburg.freifunk.net" port 10020', + '"gw22.regensburg.freifunk.net" port 10021', + '"gw22.regensburg.freifunk.net" port 10022', }, }, }, diff --git a/site.mk b/site.mk index c2f260d..c3ee86f 100644 --- a/site.mk +++ b/site.mk @@ -24,8 +24,6 @@ GLUON_SITE_PACKAGES := \ iwinfo \ iptables \ haveged \ - gluon-ebtables-filter-arp-ffmuc \ - gluon-ebtables-filter-multicast-ffmuc \ gluon-ssid-changer \ respondd-module-airtime \ ffrgb-banner #\