Merge branch 'master' of github.com:freifunk-gluon/site-ffhl

Conflicts:
	site.conf
This commit is contained in:
ohrensessel 2014-03-02 16:29:13 +01:00
commit 326b0c50f5
2 changed files with 14 additions and 2 deletions

View file

@ -177,4 +177,15 @@ Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!
</p> </p>
END END
}, },
legacy => {
version_files => ['/etc/.freifunk_version_keep', '/etc/.lff_version_keep'],
old_files => ['/etc/config/config_mode', '/etc/config/ffhl', '/etc/config/freifunk'],
config_mode_configs => ['config_mode.@wizard[0]', 'ffhl.@wizard[0]', 'freifunk.@wizard[0]'],
fastd_configs => ['ffhl_mesh_vpn', 'mesh_vpn'],
mesh_ifname => 'freifunk',
tc_configs => ['ffhl.@bandwidth[0]', 'freifunk.@bandwidth[0]'],
wifi_names => ['wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'],
},
} }

View file

@ -1,16 +1,17 @@
GLUON_SITE_PACKAGES := \ GLUON_SITE_PACKAGES := \
gluon-alfred \ gluon-alfred \
gluon-autoupdater \
gluon-config-mode \ gluon-config-mode \
gluon-ebtables-filter-multicast \ gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \ gluon-ebtables-filter-ra-dhcp \
gluon-legacy \
gluon-luci-admin \ gluon-luci-admin \
gluon-luci-autoupdater \ gluon-luci-autoupdater \
gluon-next-node \ gluon-next-node \
gluon-mesh-batman-adv \ gluon-mesh-batman-adv \
gluon-mesh-vpn-fastd \ gluon-mesh-vpn-fastd \
gluon-status-page \
gluon-autoupdater \
gluon-radvd \ gluon-radvd \
gluon-status-page \
iwinfo \ iwinfo \
iptables \ iptables \
haveged haveged