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

ibss aus config entfernen. gluon-mesh-batman-adv-15 in die zentrale config verschieben

Browse source
This commit is contained in:
Daniel Frank 2018-04-06 20:43:58 +02:00
parent 8767ae099d
commit c4c8ed4596
6 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/defaults.erb
View file

@ -29,6 +29,7 @@ gluon_site_packages = %w(
gluon-ebtables-filter-ra-dhcp gluon-ebtables-filter-ra-dhcp
gluon-ebtables-segment-mld gluon-ebtables-segment-mld
gluon-ebtables-source-filter gluon-ebtables-source-filter
gluon-mesh-batman-adv-15
gluon-mesh-vpn-fastd gluon-mesh-vpn-fastd
gluon-radvd gluon-radvd
gluon-respondd gluon-respondd
@ -44,8 +45,6 @@ gluon_site_packages = %w(
iwinfo iwinfo
) )
gluon_ath10k_mesh = "11s"
signing_keys = [ signing_keys = [
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre

3
config/ffhh-nowe.erb
View file

@ -2,8 +2,7 @@
site_name = 'Freifunk Hamburg Nordwest' site_name = 'Freifunk Hamburg Nordwest'
site_code = 'ffhh-nowe' site_code = 'ffhh-nowe'
gluon_site_packages += %w( gluon-mesh-batman-adv-15 ) gluon_site_packages += %w( )
gluon_ath10k_mesh = "11s"
prefix4 = '10.112.192.0/19' prefix4 = '10.112.192.0/19'
prefix6 = '2a03:2267:3::/64' prefix6 = '2a03:2267:3::/64'

3
config/ffhh-ost.erb
View file

@ -2,8 +2,7 @@
site_name = 'Freifunk Hamburg Ost' site_name = 'Freifunk Hamburg Ost'
site_code = 'ffhh-ost' site_code = 'ffhh-ost'
gluon_site_packages += %w( gluon-mesh-batman-adv-15 ) gluon_site_packages += %w( )
gluon_ath10k_mesh = "11s"
prefix4 = '10.112.224.0/19' prefix4 = '10.112.224.0/19'
prefix6 = '2a03:2267:4::/64' prefix6 = '2a03:2267:4::/64'

3
config/ffhh-sued.erb
View file

@ -2,8 +2,7 @@
site_name = 'Freifunk Hamburg Sued' site_name = 'Freifunk Hamburg Sued'
site_code = 'ffhh-sued' site_code = 'ffhh-sued'
gluon_site_packages += %w( gluon-mesh-batman-adv-15 ) gluon_site_packages += %w( )
gluon_ath10k_mesh = "11s"
prefix4 = '10.112.64.0/19' prefix4 = '10.112.64.0/19'
prefix6 = '2a03:2267:1::/64' prefix6 = '2a03:2267:1::/64'

3
config/ffhh-west.erb
View file

@ -2,8 +2,7 @@
site_name = 'Freifunk Hamburg West' site_name = 'Freifunk Hamburg West'
site_code = 'ffhh-west' site_code = 'ffhh-west'
gluon_site_packages += %w( gluon-mesh-batman-adv-15 ) gluon_site_packages += %w( )
gluon_ath10k_mesh = "11s"
prefix4 = '10.112.96.0/19' prefix4 = '10.112.96.0/19'
prefix6 = '2a03:2267:2::/64' prefix6 = '2a03:2267:2::/64'

16
template/site.conf.erb
View file

@ -26,18 +26,10 @@
ap = { ap = {
ssid = 'hamburg.freifunk.net', ssid = 'hamburg.freifunk.net',
}, },
<% if gluon_ath10k_mesh == "11s" -%>
mesh = { mesh = {
id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>', id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
mcast_rate = 12000, mcast_rate = 12000,
}, },
<% else -%>
ibss = {
ssid = 'f8:d1:11:87:52:2e',
bssid = 'f8:d1:11:87:52:2e',
mcast_rate = 12000,
},
<% end -%>
}, },
wifi5 = { wifi5 = {
@ -45,18 +37,10 @@
ap = { ap = {
ssid = 'hamburg.freifunk.net', ssid = 'hamburg.freifunk.net',
}, },
<% if gluon_ath10k_mesh == "11s" -%>
mesh = { mesh = {
id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>', id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
mcast_rate = 12000, mcast_rate = 12000,
}, },
<% else -%>
ibss = {
ssid = 'f8:d1:11:87:52:2e',
bssid = 'f8:d1:11:87:52:2e',
mcast_rate = 12000,
},
<% end -%>
}, },
next_node = { next_node = {