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

Migration zu Gluon Features

Browse source
This commit is contained in:
Daniel Frank 2018-09-24 21:42:39 +02:00
parent fa474b7a7d
commit 86637d7262
Signed by: tokudan
GPG key ID: 063CCCAD04182D32
6 changed files with 18 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
config/defaults.erb
View file

@ -35,31 +35,6 @@ if ENV["BROKEN"]
end end
gluon_targets.sort!.uniq! 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 = [ signing_keys = [
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre

2
config/ffhh-nowe.erb
View file

@ -2,8 +2,6 @@
site_name = 'Freifunk Hamburg Nordwest' site_name = 'Freifunk Hamburg Nordwest'
site_code = 'ffhh-nowe' site_code = 'ffhh-nowe'
gluon_site_packages += %w( )
prefix4 = '10.112.192.0/19' prefix4 = '10.112.192.0/19'
prefix6 = '2a03:2267:3::/64' prefix6 = '2a03:2267:3::/64'

2
config/ffhh-ost.erb
View file

@ -2,8 +2,6 @@
site_name = 'Freifunk Hamburg Ost' site_name = 'Freifunk Hamburg Ost'
site_code = 'ffhh-ost' site_code = 'ffhh-ost'
gluon_site_packages += %w( )
prefix4 = '10.112.224.0/19' prefix4 = '10.112.224.0/19'
prefix6 = '2a03:2267:4::/64' prefix6 = '2a03:2267:4::/64'

2
config/ffhh-sued.erb
View file

@ -2,8 +2,6 @@
site_name = 'Freifunk Hamburg Sued' site_name = 'Freifunk Hamburg Sued'
site_code = 'ffhh-sued' site_code = 'ffhh-sued'
gluon_site_packages += %w( )
prefix4 = '10.112.64.0/19' prefix4 = '10.112.64.0/19'
prefix6 = '2a03:2267:1::/64' prefix6 = '2a03:2267:1::/64'

2
config/ffhh-west.erb
View file

@ -2,8 +2,6 @@
site_name = 'Freifunk Hamburg West' site_name = 'Freifunk Hamburg West'
site_code = 'ffhh-west' site_code = 'ffhh-west'
gluon_site_packages += %w( )
prefix4 = '10.112.96.0/19' prefix4 = '10.112.96.0/19'
prefix6 = '2a03:2267:2::/64' prefix6 = '2a03:2267:2::/64'

21
template/site.mk.erb
View file

@ -1,7 +1,22 @@
GLUON_SITE_PACKAGES :=<% gluon_site_packages.each do | p | -%> GLUON_SITE_PACKAGES := -gluon-config-mode-geo-location \
<%= " " + p -%> -gluon-config-mode-contact-info \
<% end -%> 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
EXTRA_SOFTWARE_TOOLS_01 := \ EXTRA_SOFTWARE_TOOLS_01 := \