freifunk/site-ffhh
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bug fixes durch lede änderungen und jede domain hatte die gleiche mesh id

Browse source
This commit is contained in:
Daniel Frank 2017-12-30 20:02:48 +01:00
parent 33d9a521ca
commit bd256ba6c0
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.sh
View file

@ -64,8 +64,6 @@ announce Starting make update...
for s in $sites; do for s in $sites; do
export GLUON_SITEDIR="${site_path}/sites/${s}" export GLUON_SITEDIR="${site_path}/sites/${s}"
export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}/${s}" export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}/${s}"
export GLUON_IMAGEDIR="${GLUON_OUTPUTDIR}/images"
export GLUON_MODULEDIR="${GLUON_OUTPUTDIR}/modules"
rm -rf "${GLUON_OUTPUTDIR}" rm -rf "${GLUON_OUTPUTDIR}"
mkdir -p "${GLUON_IMAGEDIR}" "${GLUON_MODULEDIR}" mkdir -p "${GLUON_IMAGEDIR}" "${GLUON_MODULEDIR}"
make update make update

6
template/site.conf.erb
View file

@ -28,7 +28,7 @@
}, },
<% if gluon_ath10k_mesh == "11s" -%> <% if gluon_ath10k_mesh == "11s" -%>
mesh = { mesh = {
id = '6668682D73756564', id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
mcast_rate = 12000, mcast_rate = 12000,
}, },
<% else -%> <% else -%>
@ -47,7 +47,7 @@
}, },
<% if gluon_ath10k_mesh == "11s" -%> <% if gluon_ath10k_mesh == "11s" -%>
mesh = { mesh = {
id = '6668682D73756564', id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
mcast_rate = 12000, mcast_rate = 12000,
}, },
<% else -%> <% else -%>
@ -70,7 +70,7 @@
enabled = true, enabled = true,
mtu = <%= mtu %>, mtu = <%= mtu %>,
fastd = { fastd = {
configurable = true, configurable = true,
methods = {'salsa2012+umac'}, methods = {'salsa2012+umac'},
groups = { groups = {
backbone = { backbone = {