From c4c8ed4596d9f9741ae63b50e53ca517a671daf7 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Fri, 6 Apr 2018 20:43:58 +0200 Subject: [PATCH] ibss aus config entfernen. gluon-mesh-batman-adv-15 in die zentrale config verschieben --- config/defaults.erb | 3 +-- config/ffhh-nowe.erb | 3 +-- config/ffhh-ost.erb | 3 +-- config/ffhh-sued.erb | 3 +-- config/ffhh-west.erb | 3 +-- template/site.conf.erb | 16 ---------------- 6 files changed, 5 insertions(+), 26 deletions(-) diff --git a/config/defaults.erb b/config/defaults.erb index 02cd4fc..55eee20 100644 --- a/config/defaults.erb +++ b/config/defaults.erb @@ -29,6 +29,7 @@ gluon_site_packages = %w( gluon-ebtables-filter-ra-dhcp gluon-ebtables-segment-mld gluon-ebtables-source-filter + gluon-mesh-batman-adv-15 gluon-mesh-vpn-fastd gluon-radvd gluon-respondd @@ -44,8 +45,6 @@ gluon_site_packages = %w( iwinfo ) -gluon_ath10k_mesh = "11s" - signing_keys = [ 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre diff --git a/config/ffhh-nowe.erb b/config/ffhh-nowe.erb index f7d3f61..92b157d 100644 --- a/config/ffhh-nowe.erb +++ b/config/ffhh-nowe.erb @@ -2,8 +2,7 @@ site_name = 'Freifunk Hamburg Nordwest' site_code = 'ffhh-nowe' -gluon_site_packages += %w( gluon-mesh-batman-adv-15 ) -gluon_ath10k_mesh = "11s" +gluon_site_packages += %w( ) prefix4 = '10.112.192.0/19' prefix6 = '2a03:2267:3::/64' diff --git a/config/ffhh-ost.erb b/config/ffhh-ost.erb index 53052c8..1cb7b72 100644 --- a/config/ffhh-ost.erb +++ b/config/ffhh-ost.erb @@ -2,8 +2,7 @@ site_name = 'Freifunk Hamburg Ost' site_code = 'ffhh-ost' -gluon_site_packages += %w( gluon-mesh-batman-adv-15 ) -gluon_ath10k_mesh = "11s" +gluon_site_packages += %w( ) prefix4 = '10.112.224.0/19' prefix6 = '2a03:2267:4::/64' diff --git a/config/ffhh-sued.erb b/config/ffhh-sued.erb index 65e09f2..b970c9c 100644 --- a/config/ffhh-sued.erb +++ b/config/ffhh-sued.erb @@ -2,8 +2,7 @@ site_name = 'Freifunk Hamburg Sued' site_code = 'ffhh-sued' -gluon_site_packages += %w( gluon-mesh-batman-adv-15 ) -gluon_ath10k_mesh = "11s" +gluon_site_packages += %w( ) prefix4 = '10.112.64.0/19' prefix6 = '2a03:2267:1::/64' diff --git a/config/ffhh-west.erb b/config/ffhh-west.erb index 428199e..b9775de 100644 --- a/config/ffhh-west.erb +++ b/config/ffhh-west.erb @@ -2,8 +2,7 @@ site_name = 'Freifunk Hamburg West' site_code = 'ffhh-west' -gluon_site_packages += %w( gluon-mesh-batman-adv-15 ) -gluon_ath10k_mesh = "11s" +gluon_site_packages += %w( ) prefix4 = '10.112.96.0/19' prefix6 = '2a03:2267:2::/64' diff --git a/template/site.conf.erb b/template/site.conf.erb index 1b46d6c..05f9ccd 100644 --- a/template/site.conf.erb +++ b/template/site.conf.erb @@ -26,18 +26,10 @@ ap = { ssid = 'hamburg.freifunk.net', }, -<% if gluon_ath10k_mesh == "11s" -%> mesh = { id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>', mcast_rate = 12000, }, -<% else -%> - ibss = { - ssid = 'f8:d1:11:87:52:2e', - bssid = 'f8:d1:11:87:52:2e', - mcast_rate = 12000, - }, -<% end -%> }, wifi5 = { @@ -45,18 +37,10 @@ ap = { ssid = 'hamburg.freifunk.net', }, -<% if gluon_ath10k_mesh == "11s" -%> mesh = { id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>', 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 = {