From 2aea4b65b54142c77890ea42b53fa15a444f5ee3 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Sun, 26 Feb 2017 17:06:38 +0100 Subject: [PATCH] Make changes necessary for v2017.1 * Rename gluon-luci-* to gluon-web-* * Remove openwrt package repo (the usual LEDE repo has IPv6 connectivity) * Remove package gluon-next-node (the functionality has been merged into other packages) * Move fastd configuration to new mesh_vpn subsection --- modules | 3 ++- site.conf | 55 ++++++++++++++++++++++++++++--------------------------- site.mk | 17 ++++++++--------- 3 files changed, 38 insertions(+), 37 deletions(-) diff --git a/modules b/modules index 0bf19a1..9327ff7 100644 --- a/modules +++ b/modules @@ -1,4 +1,5 @@ GLUON_SITE_FEEDS='ffhb' PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git -PACKAGES_FFHB_COMMIT=d3ec6bba927f755e1a6f43c132aae8c97217bd8d +PACKAGES_FFHB_BRANCH=v2017.1 +PACKAGES_FFHB_COMMIT=ee75f9971712b1595e2f397963c0bdfb03114a1c diff --git a/site.conf b/site.conf index 1993f00..ea3f708 100755 --- a/site.conf +++ b/site.conf @@ -54,34 +54,36 @@ mac = '16:41:95:40:f7:dc', }, - fastd_mesh_vpn = { - methods = {'salsa2012+umac'}, + mesh_vpn = { enabled = true, - configurable = true, mtu = 1280, - groups = { - backbone = { - limit = 1, - peers = { - vpn01 = { - key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f', - remotes = {'"vpn01.bremen.freifunk.net" port 50000', '"vpn01.ffhb.de" port 50000'}, - }, - vpn02 = { - key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c', - remotes = {'"vpn02.bremen.freifunk.net" port 50000', '"vpn02.ffhb.de" port 50000'}, - }, - vpn03 = { - key = '6c16136b58da06e3cc83bc92ef09bb19b7dfa787e390929a0ac0d4bbebddee2b', - remotes = {'"vpn03.bremen.freifunk.net" port 50000', '"vpn03.ffhb.de" port 50000'}, - }, - vpn05 = { - key = '6cff5957231ca2936aabaa75ae5a7985f4077246b8956273b2ce2da559f344a9', - remotes = {'"vpn05.bremen.freifunk.net" port 50000', '"vpn05.ffhb.de" port 50000'}, - }, - vpn06 = { - key = '99cb85ea2e6346b52abf5eb5ca824f7f037324d4e476f4f068c48b9da98f30e3', - remotes = {'"vpn06.bremen.freifunk.net" port 50000', '"vpn06.ffhb.de" port 50000'}, + fastd = { + methods = {'salsa2012+umac'}, + configurable = true, + groups = { + backbone = { + limit = 1, + peers = { + vpn01 = { + key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f', + remotes = {'"vpn01.bremen.freifunk.net" port 50000', '"vpn01.ffhb.de" port 50000'}, + }, + vpn02 = { + key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c', + remotes = {'"vpn02.bremen.freifunk.net" port 50000', '"vpn02.ffhb.de" port 50000'}, + }, + vpn03 = { + key = '6c16136b58da06e3cc83bc92ef09bb19b7dfa787e390929a0ac0d4bbebddee2b', + remotes = {'"vpn03.bremen.freifunk.net" port 50000', '"vpn03.ffhb.de" port 50000'}, + }, + vpn05 = { + key = '6cff5957231ca2936aabaa75ae5a7985f4077246b8956273b2ce2da559f344a9', + remotes = {'"vpn05.bremen.freifunk.net" port 50000', '"vpn05.ffhb.de" port 50000'}, + }, + vpn06 = { + key = '99cb85ea2e6346b52abf5eb5ca824f7f037324d4e476f4f068c48b9da98f30e3', + remotes = {'"vpn06.bremen.freifunk.net" port 50000', '"vpn06.ffhb.de" port 50000'}, + }, }, }, }, @@ -94,7 +96,6 @@ }, opkg = { - openwrt = 'http://downloads.bremen.freifunk.net/opkg/openwrt/%n/%v/%S/packages', extra = { modules = 'http://downloads.bremen.freifunk.net/opkg/modules/gluon-%GS-%GR/%S', }, diff --git a/site.mk b/site.mk index 75a7529..8ca9988 100755 --- a/site.mk +++ b/site.mk @@ -12,14 +12,13 @@ GLUON_SITE_PACKAGES := \ gluon-ebtables-filter-multicast \ gluon-ebtables-filter-ra-dhcp \ gluon-ebtables-segment-mld \ - gluon-luci-admin \ - gluon-luci-autoupdater \ - gluon-luci-mesh-vpn-fastd \ - gluon-luci-portconfig \ - gluon-luci-private-wifi \ - gluon-luci-wifi-config \ + gluon-web-admin \ + gluon-web-autoupdater \ + gluon-web-mesh-vpn-fastd \ + gluon-web-network \ + gluon-web-private-wifi \ + gluon-web-wifi-config \ gluon-mesh-vpn-fastd \ - gluon-next-node \ gluon-radv-filterd \ gluon-radvd \ gluon-setup-mode \ @@ -31,10 +30,10 @@ GLUON_SITE_PACKAGES := \ firewall \ haveged -# Variables set with ?= can be overwritten from the command line +# Allow overriding the these variables from the command line GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+)) export GLUON_BRANCH ?= stable -GLUON_PRIORITY ?= 7 +GLUON_PRIORITY ?= 0 GLUON_LANGS ?= en de GLUON_REGION ?= eu GLUON_ATH10K_MESH ?= ibss