krombel/site-ffmuc
1
0
Fork 0
forked from remote/site-ffmuc
Code Issues 4 Pull Requests 1 Releases Wiki Activity

Merge branch 'experimental'

Browse Source
This commit is contained in:
Franz Pletz
2015-11-06 00:50:37 +01:00
parent af8a3efe88 d116887d1a
commit 070612c696
2 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -42,15 +42,15 @@ 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} output/images/sysupgrade/${GLUON_BRANCH}.manifest
${GLUON_BUILD_DIR}: ${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: output-clean ${GLUON_BUILD_DIR}
(cd ${GLUON_BUILD_DIR} \ (cd ${GLUON_BUILD_DIR} \
&& git remote set-url origin ${GLUON_GIT_URL} \ && git remote set-url origin ${GLUON_GIT_URL} \
&& git fetch origin \ && git fetch origin \
@@ -61,7 +61,7 @@ gluon-prepare: images-clean ${GLUON_BUILD_DIR}
gluon-clean: gluon-clean:
rm -rf ${GLUON_BUILD_DIR} rm -rf ${GLUON_BUILD_DIR}
images-clean: output-clean:
rm -rf images rm -rf output
clean: gluon-clean images-clean clean: gluon-clean output-clean

38
site.conf
View File

@@ -15,21 +15,43 @@
regdom = 'DE', regdom = 'DE',
wifi24 = { wifi24 = {
ssid = 'muenchen.freifunk.net',
channel = 6, channel = 6,
htmode = 'HT20', htmode = 'HT20',
mesh_ssid = 'mesh.ffmuc', ap = {
mesh_bssid = '02:0E:8E:1E:61:17', ssid = 'muenchen.freifunk.net',
mesh_mcast_rate = 12000, },
mesh = {
id = 'ffmuc-mesh',
mcast_rate = 12000,
},
ibss = {
ssid = 'mesh.ffmuc',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
},
}, },
wifi5 = { wifi5 = {
ssid = 'muenchen.freifunk.net',
channel = 44, channel = 44,
htmode = 'HT40+', htmode = 'HT40+',
mesh_ssid = 'mesh.ffmuc', ap = {
mesh_bssid = '02:0E:8E:1E:61:17', ssid = 'muenchen.freifunk.net',
mesh_mcast_rate = 12000, },
mesh = {
id = 'ffmuc-mesh',
mcast_rate = 12000,
},
ibss = {
ssid = 'mesh.ffmuc',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
},
},
mesh = {
batman_adv = {
gw_sel_class = 3,
},
}, },
next_node = { next_node = {