From 86637d726275e9710b66cf0f4df60523621755fe Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Mon, 24 Sep 2018 21:42:39 +0200 Subject: [PATCH] Migration zu Gluon Features --- config/defaults.erb | 25 ------------------------- config/ffhh-nowe.erb | 2 -- config/ffhh-ost.erb | 2 -- config/ffhh-sued.erb | 2 -- config/ffhh-west.erb | 2 -- template/site.mk.erb | 21 ++++++++++++++++++--- 6 files changed, 18 insertions(+), 36 deletions(-) diff --git a/config/defaults.erb b/config/defaults.erb index bcb4a45..9d3236a 100644 --- a/config/defaults.erb +++ b/config/defaults.erb @@ -35,31 +35,6 @@ if ENV["BROKEN"] end gluon_targets.sort!.uniq! -gluon_site_packages = %w( - gluon-autoupdater - gluon-config-mode-autoupdater - gluon-config-mode-core - gluon-config-mode-hostname - gluon-config-mode-mesh-vpn - gluon-ebtables-filter-multicast - gluon-ebtables-filter-ra-dhcp - gluon-ebtables-source-filter - gluon-mesh-batman-adv-15 - gluon-mesh-vpn-fastd - gluon-radvd - gluon-respondd - gluon-setup-mode - gluon-status-page - gluon-web-admin - gluon-web-autoupdater - gluon-web-network - gluon-web-private-wifi - gluon-web-wifi-config - haveged - iptables - iwinfo -) - signing_keys = [ 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre diff --git a/config/ffhh-nowe.erb b/config/ffhh-nowe.erb index 92b157d..39f6aec 100644 --- a/config/ffhh-nowe.erb +++ b/config/ffhh-nowe.erb @@ -2,8 +2,6 @@ site_name = 'Freifunk Hamburg Nordwest' site_code = 'ffhh-nowe' -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 1cb7b72..8539b32 100644 --- a/config/ffhh-ost.erb +++ b/config/ffhh-ost.erb @@ -2,8 +2,6 @@ site_name = 'Freifunk Hamburg Ost' site_code = 'ffhh-ost' -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 b970c9c..2f76b16 100644 --- a/config/ffhh-sued.erb +++ b/config/ffhh-sued.erb @@ -2,8 +2,6 @@ site_name = 'Freifunk Hamburg Sued' site_code = 'ffhh-sued' -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 b9775de..aaf5399 100644 --- a/config/ffhh-west.erb +++ b/config/ffhh-west.erb @@ -2,8 +2,6 @@ site_name = 'Freifunk Hamburg West' site_code = 'ffhh-west' -gluon_site_packages += %w( ) - prefix4 = '10.112.96.0/19' prefix6 = '2a03:2267:2::/64' diff --git a/template/site.mk.erb b/template/site.mk.erb index b5fa761..facd7d8 100644 --- a/template/site.mk.erb +++ b/template/site.mk.erb @@ -1,7 +1,22 @@ -GLUON_SITE_PACKAGES :=<% gluon_site_packages.each do | p | -%> -<%= " " + p -%> -<% end -%> +GLUON_SITE_PACKAGES := -gluon-config-mode-geo-location \ + -gluon-config-mode-contact-info \ + gluon-ebtables-source-filter \ + haveged \ + iptables \ + iwinfo +GLUON_FEATURES := \ + autoupdater \ + ebtables-filter-multicast \ + ebtables-filter-ra-dhcp \ + ebtables-limit-arp \ + mesh-batman-adv-15 \ + mesh-vpn-fastd \ + radvd \ + respondd \ + status-page \ + web-advanced \ + web-wizard # EXTRA_SOFTWARE_TOOLS_01 EXTRA_SOFTWARE_TOOLS_01 := \