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

Remove support for upgrading legacy nodes

Browse source 
Directly upgrade from pre-gluon notes is no longer supported.

This commit also cleans some white spaces.
This commit is contained in:
bdobe 2015-06-14 18:55:56 +02:00
parent 2b9e831a7b
commit 6a73a2e1ce
2 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
site.conf
View file

@ -19,6 +19,7 @@
mesh_bssid = 'f8:d1:11:87:52:2e', mesh_bssid = 'f8:d1:11:87:52:2e',
mesh_mcast_rate = 12000, mesh_mcast_rate = 12000,
}, },
wifi5 = { wifi5 = {
ssid = 'hamburg.freifunk.net', ssid = 'hamburg.freifunk.net',
channel = 44, channel = 44,
@ -93,22 +94,22 @@
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {
'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo '417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
}, },
}, },
beta = { beta = {
name = 'beta', name = 'beta',
mirrors = {'http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'}, mirrors = {'http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'},
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {
'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo '417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
}, },
}, },
experimental = { experimental = {
name = 'experimental', name = 'experimental',
mirrors = {'http://1.updates.services.ffhh/experimental/sysupgrade','http://2.updates.services.ffhh/experimental/sysupgrade'}, mirrors = {'http://1.updates.services.ffhh/experimental/sysupgrade','http://2.updates.services.ffhh/experimental/sysupgrade'},
@ -129,14 +130,4 @@
}, },
}, },
legacy = {
version_files = {'/etc/.freifunk_version_keep'},
old_files = {'/etc/config/config_mode', '/etc/config/freifunk'},
config_mode_configs = {'config_mode.@wizard{0}', 'freifunk.@wizard{0}'},
fastd_configs = {'mesh_vpn'},
mesh_ifname = 'freifunk',
tc_configs = {'freifunk.@bandwidth{0}'},
wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
},
} }

5
site.mk
View file

@ -4,13 +4,12 @@ GLUON_SITE_PACKAGES := \
gluon-announced \ gluon-announced \
gluon-autoupdater \ gluon-autoupdater \
gluon-config-mode-autoupdater \ gluon-config-mode-autoupdater \
gluon-config-mode-core \ gluon-config-mode-core \
gluon-config-mode-hostname \ gluon-config-mode-hostname \
gluon-config-mode-mesh-vpn \ gluon-config-mode-mesh-vpn \
gluon-config-mode-reboot-ffhh \ gluon-config-mode-reboot-ffhh \
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-luci-portconfig \ gluon-luci-portconfig \
@ -18,7 +17,7 @@ GLUON_SITE_PACKAGES := \
gluon-next-node \ gluon-next-node \
gluon-mesh-vpn-fastd \ gluon-mesh-vpn-fastd \
gluon-radvd \ gluon-radvd \
gluon-setup-mode \ gluon-setup-mode \
gluon-status-page \ gluon-status-page \
iwinfo \ iwinfo \
iptables \ iptables \