From 8427b004a464440c7c5fe06884891b6f58d7601f Mon Sep 17 00:00:00 2001 From: Bastian Date: Wed, 7 Oct 2015 14:24:36 +0200 Subject: [PATCH 1/6] update to gluon-2015.1.2 --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 38914d1..dd95386 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,15 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2015.1 +GLUON_GIT_REF := v2015.1.2 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ ar71xx-generic \ ar71xx-nand \ - x86-kvm_guest + x86-kvm_guest \ + x86-generic \ + x86-xen_domu GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) From 8850e00b145b782f639862bc291a1f9b5e3296f0 Mon Sep 17 00:00:00 2001 From: Bastian Date: Fri, 20 Nov 2015 12:40:18 +0100 Subject: [PATCH 2/6] 841v10 support --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dd95386..08f3855 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2015.1.2 +GLUON_GIT_REF := 3f704405276c86db17052df234179bc5a7f24aae SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key @@ -8,8 +8,7 @@ GLUON_TARGETS ?= \ ar71xx-generic \ ar71xx-nand \ x86-kvm_guest \ - x86-generic \ - x86-xen_domu + x86-generic GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) From ef4f01ea757ed3fab61d9050b07a0ca0811a6d24 Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 22 Nov 2015 18:13:58 +0100 Subject: [PATCH 3/6] 2015.1.2 build --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 08f3855..23ccd2e 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,12 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := 3f704405276c86db17052df234179bc5a7f24aae +GLUON_GIT_REF := v2015.1.2 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ ar71xx-generic \ - ar71xx-nand \ - x86-kvm_guest \ - x86-generic + ar71xx-nand GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) @@ -18,9 +16,10 @@ else endif JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) -JOBS = 1 -GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \ +#JOBS = 1 + +GLUON_MAKE := ${MAKE} V=s -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_RELEASE=${GLUON_RELEASE} \ GLUON_BRANCH=${GLUON_BRANCH} \ From abaf53e019654adbb506cef52783b8269928e7db Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 22 Nov 2015 19:47:29 +0100 Subject: [PATCH 4/6] new master.. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 23ccd2e..0c3dc74 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2015.1.2 +GLUON_GIT_REF := master SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 8cb642120aaee2fb3e4929c1efe85d2bc159929f Mon Sep 17 00:00:00 2001 From: Bastian Date: Sat, 12 Dec 2015 22:07:19 +0100 Subject: [PATCH 5/6] Changed site.conf to 2015.2, added Chaos Calmer changes... --- Makefile | 12 +++++++++--- site.conf | 45 +++++++++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 0c3dc74..b72c760 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,10 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ ar71xx-generic \ - ar71xx-nand + ar71xx-nand \ + mpc85xx-generic \ + x86-generic \ + x86-kvm_guest GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) @@ -42,7 +45,7 @@ build: gluon-prepare manifest: build ${GLUON_MAKE} manifest - mv ${GLUON_BUILD_DIR}/images . + mv ${GLUON_BUILD_DIR}/output . sign: manifest ${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest @@ -51,7 +54,10 @@ ${GLUON_BUILD_DIR}: git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR} gluon-prepare: images-clean ${GLUON_BUILD_DIR} - (cd ${GLUON_BUILD_DIR} && git fetch origin && git checkout -q ${GLUON_GIT_REF}) + (cd ${GLUON_BUILD_DIR} \ + && git remote set-url origin ${GLUON_GIT_URL} \ + && git fetch origin \ + && git checkout -q ${GLUON_GIT_REF}) ln -sfT .. ${GLUON_BUILD_DIR}/site ${GLUON_MAKE} update diff --git a/site.conf b/site.conf index 42cb984..0755777 100644 --- a/site.conf +++ b/site.conf @@ -2,7 +2,10 @@ hostname_prefix = 'freifunk-rgb_', site_name = 'Freifunk Regensburg', site_code = 'ffrgb-bat15', - opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages', + + opkg = { + openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages', + }, prefix4 = '10.90.0.0/16', prefix6 = 'fdef:f00f:1337:cafe/64', @@ -15,21 +18,27 @@ regdom = 'DE', wifi24 = { - ssid = 'regensburg.freifunk.net', channel = 1, - htmode = 'HT40+', - mesh_ssid = 'mesh.ffrgb', - mesh_bssid = '02:0E:8E:1E:61:17', - mesh_mcast_rate = 12000, + ap = { + ssid = 'regensburg.freifunk.net', + }, + ibss = { + ssid = 'mesh.ffrgb', + bssid = '02:0E:8E:1E:61:17', + mcast_rate = 12000, + }, }, wifi5 = { - ssid = 'regensburg.freifunk.net', channel = 44, - htmode = 'HT40+', - mesh_ssid = 'mesh.ffrgb', - mesh_bssid = '02:0E:8E:1E:61:17', - mesh_mcast_rate = 12000, + ap = { + ssid = 'regensburg.freifunk.net', + }, + ibss = { + ssid = 'mesh.ffrgb', + bssid = '02:0E:8E:1E:61:17', + mcast_rate = 12000, + } }, next_node = { @@ -40,6 +49,11 @@ fastd_mesh_vpn = { + bandwidth_limit = { + enabled = false, + ingress = 12000, + egress = 1200, + }, methods = {'salsa2012+umac'}, mtu = 1426, groups = { @@ -93,14 +107,5 @@ }, }, }, - - simple_tc = { - mesh_vpn = { - ifname = 'mesh-vpn', - enabled = false, - limit_egress = 1200, - limit_ingress = 12000, - }, - }, } -- vim: set ft=lua:ts=2:sw=2:et From 92febc35a39dd709011c214a7c3fd6db2b137289 Mon Sep 17 00:00:00 2001 From: Bastian Date: Thu, 17 Dec 2015 20:31:20 +0100 Subject: [PATCH 6/6] removed hostname prefix --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 0755777..8f97cc7 100644 --- a/site.conf +++ b/site.conf @@ -1,5 +1,5 @@ { - hostname_prefix = 'freifunk-rgb_', + hostname_prefix = '', site_name = 'Freifunk Regensburg', site_code = 'ffrgb-bat15',