Update site for Gluon 2017.1

- see https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.html#site-changes
freifunk-goettingen · Jun 20, 2017 · 7682d1c · 7682d1c
1 parent e29ee51
commit 7682d1c
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 40 deletions.
diff --git a/README b/README
@@ -3,7 +3,7 @@ Freifunk Göttingen
 
 Auf welcher Gluon-Version basiert die Göttinger Firmware?
 
-* 0.8.7 (experimental): gluon-v2016.2.3
+* 0.8.7 (stable): gluon-v2016.2.3
 * 0.8.6 (experimental): gluon-v2016.2.2-5-g12fae2d
 * 0.8.5 (experimental): gluon-v2016.2.2
 * 0.8.3 (experimental): gluon-v2016.2

diff --git a/site.conf b/site.conf
@@ -4,7 +4,7 @@
  site_code = 'ffgoe',
 
  opkg = {
- openwrt = 'http://openwrt.ffgoe/%n/%v/%S/packages',
+ lede = 'http://openwrt.ffgoe/%n/%v/%S/packages',
  extra = {
  modules = 'http://1.updates.services.ffgoe/gluon/modules/gluon-%GS-%GR/%S',
  },
@@ -55,41 +55,43 @@
  mac = '16:41:95:40:f7:dc',
  },
 
- fastd_mesh_vpn = {
- methods = {'salsa2012+umac'},
+ mesh_vpn = {
  mtu = 1406,
- groups = {
- backbone = {
- limit = 1,
- peers = {
- vpn1 = {
- key = '550af47507836d6684bddf0299c720a9a4ac08e62e53b23765d6d44c97f6ff8d',
- remotes = {'ipv4 "1.vpn.freifunk-goettingen.de" port 12345'},
- },
- vpn2 = {
- key = 'c296da27b87338fa247ceac17f5dc2bc39ec4182bfbb18f8c6e50eeae82bf65a',
- remotes = {'ipv4 "2.vpn.freifunk-goettingen.de" port 12345'},
- },
- vpn3 = {
- key = '6c728976dd225bd69cc93da238b11d18f70028497ffbb8670351560ab2da6193',
- remotes = {'ipv4 "3.vpn.freifunk-goettingen.de" port 12345'},
- },
- vpn4 = {
- key = '48ded56a86dbdbb986160490ca8b125b7748d6b3774e748f900244d74ac7695f',
- remotes = {'ipv4 "4.vpn.freifunk-goettingen.de" port 12345'},
- },
- vpn5 = {
- key = 'dab1e33fa020b2edf96d6a13fa9c3292626b6b5d3d9ab21395f8b400185de0b8',
- remotes = {'ipv4 "5.vpn.freifunk-goettingen.de" port 12345'},
- },
- vpn6 = {
- key = '0c25dbbe1996022d963b3562407c407718802c50fc4a1c9301f4906b6c62e381',
- remotes = {'ipv4 "6.vpn.freifunk-goettingen.de" port 12345'},
- },
- },
- },
+ fastd = {
+ methods = {'salsa2012+umac'},
+ groups = {
+ backbone = {
+ limit = 1,
+ peers = {
+ vpn1 = {
+ key = '550af47507836d6684bddf0299c720a9a4ac08e62e53b23765d6d44c97f6ff8d',
+ remotes = {'ipv4 "1.vpn.freifunk-goettingen.de" port 12345'},
+ },
+ vpn2 = {
+ key = 'c296da27b87338fa247ceac17f5dc2bc39ec4182bfbb18f8c6e50eeae82bf65a',
+ remotes = {'ipv4 "2.vpn.freifunk-goettingen.de" port 12345'},
+ },
+ vpn3 = {
+ key = '6c728976dd225bd69cc93da238b11d18f70028497ffbb8670351560ab2da6193',
+ remotes = {'ipv4 "3.vpn.freifunk-goettingen.de" port 12345'},
+ },
+ vpn4 = {
+ key = '48ded56a86dbdbb986160490ca8b125b7748d6b3774e748f900244d74ac7695f',
+ remotes = {'ipv4 "4.vpn.freifunk-goettingen.de" port 12345'},
+ },
+ vpn5 = {
+ key = 'dab1e33fa020b2edf96d6a13fa9c3292626b6b5d3d9ab21395f8b400185de0b8',
+ remotes = {'ipv4 "5.vpn.freifunk-goettingen.de" port 12345'},
+ },
+ vpn6 = {
+ key = '0c25dbbe1996022d963b3562407c407718802c50fc4a1c9301f4906b6c62e381',
+ remotes = {'ipv4 "6.vpn.freifunk-goettingen.de" port 12345'},
+ },
+ },
+ },
 
- },
+ },
+ },
  bandwidth_limit = {
  enabled = false, -- The bandwidth limit can be enabled by default here.
  egress = 200, -- Default upload limit (kbit/s).

diff --git a/site.mk b/site.mk
@@ -10,11 +10,10 @@ GLUON_SITE_PACKAGES := \
  gluon-config-mode-mesh-vpn \
  gluon-ebtables-filter-multicast \
  gluon-ebtables-filter-ra-dhcp \
- gluon-luci-admin \
- gluon-luci-autoupdater \
- gluon-luci-portconfig \
- gluon-luci-wifi-config \
- gluon-next-node \
+ gluon-web-admin \
+ gluon-web-autoupdater \
+ gluon-web-network \
+ gluon-web-wifi-config \
  gluon-mesh-vpn-fastd \
  gluon-radvd \
  gluon-setup-mode \