sprinterfreak/site-ffrgb-dev
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'experimental' of https://github.com/MAFLO321/site-ffrgb

Browse Source
This commit is contained in:
Matthias Freund 2016-04-17 21:40:06 +02:00
commit b2e81fdf59
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -1,12 +1,14 @@
GLUON_BUILD_DIR := gluon-build GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
GLUON_GIT_REF := v2015.1 GLUON_GIT_REF := master
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
GLUON_TARGETS ?= \ GLUON_TARGETS ?= \
ar71xx-generic \ ar71xx-generic \
ar71xx-nand \ ar71xx-nand \
mpc85xx-generic \
x86-generic \
x86-kvm_guest x86-kvm_guest
GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
@ -17,9 +19,10 @@ else
endif endif
JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) 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_RELEASE=${GLUON_RELEASE} \
GLUON_BRANCH=${GLUON_BRANCH} \ GLUON_BRANCH=${GLUON_BRANCH} \
@ -42,7 +45,7 @@ build: gluon-prepare
manifest: build manifest: build
${GLUON_MAKE} manifest ${GLUON_MAKE} manifest
mv ${GLUON_BUILD_DIR}/images . mv ${GLUON_BUILD_DIR}/output .
sign: manifest sign: manifest
${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.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} git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
gluon-prepare: images-clean ${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 ln -sfT .. ${GLUON_BUILD_DIR}/site
${GLUON_MAKE} update ${GLUON_MAKE} update

47
site.conf
View File

@ -1,8 +1,11 @@
{ {
hostname_prefix = 'freifunk-rgb_', hostname_prefix = '',
site_name = 'Freifunk Regensburg', site_name = 'Freifunk Regensburg',
site_code = 'ffrgb-bat15', 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', prefix4 = '10.90.0.0/16',
prefix6 = 'fdef:f00f:1337:cafe/64', prefix6 = 'fdef:f00f:1337:cafe/64',
@ -15,21 +18,27 @@
regdom = 'DE', regdom = 'DE',
wifi24 = { wifi24 = {
ssid = 'regensburg.freifunk.net',
channel = 1, channel = 1,
htmode = 'HT40+', ap = {
mesh_ssid = 'mesh.ffrgb', ssid = 'regensburg.freifunk.net',
mesh_bssid = '02:0E:8E:1E:61:17', },
mesh_mcast_rate = 12000, ibss = {
ssid = 'mesh.ffrgb',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
},
}, },
wifi5 = { wifi5 = {
ssid = 'regensburg.freifunk.net',
channel = 44, channel = 44,
htmode = 'HT40+', ap = {
mesh_ssid = 'mesh.ffrgb', ssid = 'regensburg.freifunk.net',
mesh_bssid = '02:0E:8E:1E:61:17', },
mesh_mcast_rate = 12000, ibss = {
ssid = 'mesh.ffrgb',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
}
}, },
next_node = { next_node = {
@ -40,6 +49,11 @@
fastd_mesh_vpn = { fastd_mesh_vpn = {
bandwidth_limit = {
enabled = false,
ingress = 12000,
egress = 1200,
},
methods = {'salsa2012+umac'}, methods = {'salsa2012+umac'},
mtu = 1426, mtu = 1426,
groups = { 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 -- vim: set ft=lua:ts=2:sw=2:et