diff --git a/modules b/modules
index 4647e27cc7de99feecabe133787a7a3cbbbe6f5b..c75743abb3756ba8b0b6b24ea4aab91e3a155b5f 100644
--- a/modules
+++ b/modules
@@ -1,21 +1,25 @@
# This file allows specifying additional repositories to use
# when building gluon.
-GLUON_SITE_FEEDS='ffhh ffki roamguide'
+GLUON_SITE_FEEDS='ffhh ffki roamguide ssidchanger'
# the git repository from where to clone the package feed
PACKAGES_FFHH_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
PACKAGES_FFKI_REPO=git://github.com/freifunk-kiel/ffki-packages.git
+PACKAGES_SSIDCHANGER_REPO=https://github.com/freifunk-nord/gluon-ssid-changer.git
PACKAGES_ROAMGUIDE_REPO=https://git.toppoint.de/sargon/roamguide
# for roamguide:
-# GIT_SSL_NO_VERIFY=true git clone https://git.toppoint.de/sargon/roamguide
+GIT_SSL_NO_VERIFY=true git clone https://git.toppoint.de/sargon/roamguide
+
# the version/commit of the git repository to clone
PACKAGES_FFHH_COMMIT=818765060bc76a109dde1558513fd086e5973ef1
PACKAGES_FFKI_COMMIT=67ffe553db95684aa144aa5b5d15905d18d44efb
PACKAGES_ROAMGUIDE_COMMIT=cc8253d6dd62cd6ba4f04506711edd0705dc5532
+PACKAGES_SSIDCHANGER_COMMIT=2550af343202746ac6be9ce9b719cb1caa672d82
# the branch to check out
PACKAGES_FFHH_BRANCH=master
PACKAGES_FFKI_BRANCH=master
PACKAGES_ROAMGUIDE_BRANCH=master
+PACKAGES_SSIDCHANGER_BRANCH=master
diff --git a/site.conf b/site.conf
index f8e73873e79ea5fae7f8d97542923841a5e193e0..c44bc744ff0f90fda0554c06484564fb0d121fa4 100644
--- a/site.conf
+++ b/site.conf
@@ -85,51 +85,51 @@
peers = {
ffnord_vpn0 = {
key = '3dd48007765a0392244df2f3b627c487bae1269d242278140ab6caac1e5f5f34',
- remotes = {'ipv4 "vpn0.ffnord.net" port 10050','ipv6 "vpn0.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn0.freifunknord.de" port 10050','ipv6 "vpn0.freifunknord.de" port 10050'},
},
ffnord_vpn1 = {
key = '552e490f8b3392a8f92b20ad66134a3b6ed298bb22ee72a3bb9685ce4da06216',
- remotes = {'ipv4 "vpn1.ffnord.net" port 10050', 'ipv6 "vpn1.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn1.freifunknord.de" port 10050', 'ipv6 "vpn1.freifunknord.de" port 10050'},
},
ffnord_vpn2 = {
key = 'fe534908794ab69e3c12a109fdaf723b5857ad76bd214220a08fc7cd245df4f8',
- remotes = {'ipv4 "vpn2.ffnord.net" port 10050', 'ipv6 "vpn2.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn2.freifunknord.de" port 10050', 'ipv6 "vpn2.freifunknord.de" port 10050'},
},
ffnord_vpn3 = {
key = '51cb55fac596f8bdcaddc721d2390d44ef8d9ef0ff0c9152a44b8bd823207909',
- remotes = {'ipv4 "vpn3.ffnord.net" port 10050', 'ipv6 "vpn3.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn3.freifunknord.de" port 10050', 'ipv6 "vpn3.freifunknord.de" port 10050'},
},
ffnord_vpn4 = {
key = '2bd5bb1f45f76b0c43d3ba145b162d4d08960b12f968e5a7abeb2b3400b64d05',
- remotes = {'ipv4 "vpn4.ffnord.net" port 10050', 'ipv6 "vpn4.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn4.freifunknord.de" port 10050', 'ipv6 "vpn4.freifunknord.de" port 10050'},
},
ffnord_vpn5 = {
key = '766c2380bb1118ccd7132ad0588a65f20242c9d1995869c1509b0e91f1fc79e0',
- remotes = {'ipv4 "vpn5.ffnord.net" port 10050', 'ipv6 "vpn5.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn5.freifunknord.de" port 10050', 'ipv6 "vpn5.freifunknord.de" port 10050'},
},
ffnord_vpn6 = {
key = '734913882d3592603d1c704d4e4133c12606192ebd1a49429e7d980a2ca121d0',
- remotes = {'ipv4 "vpn6.ffnord.net" port 10050', 'ipv6 "vpn6.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn6.freifunknord.de" port 10050', 'ipv6 "vpn6.freifunknord.de" port 10050'},
},
ffnord_vpn7 = {
key = '6c35f366d430a6637cf5696fee2806b70ea4a3b3dfba2cb0e576b3ef4a77a7be',
- remotes = {'ipv4 "vpn7.ffnord.net" port 10050', 'ipv6 "vpn7.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn7.freifunknord.de" port 10050', 'ipv6 "vpn7.freifunknord.de" port 10050'},
},
ffnord_vpn8 = {
key = '9d6bf926071340171cc8a692c9a858e482a4368856dcb63e095e393049b8d6fd',
- remotes = {'ipv4 "vpn8.ffnord.net" port 10050', 'ipv6 "vpn8.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn8.freifunknord.de" port 10050', 'ipv6 "vpn8.freifunknord.de" port 10050'},
},
ffnord_vpn9 = {
key = '3b09482cee91e08839c1bfcca5a1135583c03817b1e8ff52019902faef7e2f28',
- remotes = {'ipv4 "vpn9.ffnord.net" port 10050', 'ipv6 "vpn9.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn9.freifunknord.de" port 10050', 'ipv6 "vpn9.freifunknord.de" port 10050'},
},
ffnord_vpn10 = {
key = 'a326197364109a3a7bfc9344e19da9277734989bc06d930617e00206feb6a065',
- remotes = {'ipv4 "vpn10.ffnord.net" port 10050', 'ipv6 "vpn10.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn10.freifunknord.de" port 10050', 'ipv6 "vpn10.freifunknord.de" port 10050'},
},
ffnord_vpn11 = {
key = '9ab17517450a52d1eac521a6ae4e696cf7861c3e55cd63acf0a94e85cb3e5172',
- remotes = {'ipv4 "vpn11.ffnord.net" port 10050', 'ipv6 "vpn11.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn11.freifunknord.de" port 10050', 'ipv6 "vpn11.freifunknord.de" port 10050'},
},
ffnord_vpn12 = {
key = 'bec4e95be17044ead0e1926b58cafc0d2cca9df3eb7a836234e886f3b51679f9',
@@ -145,7 +145,7 @@
},
ffnord_vpn15 = {
key = 'ae5bfc856ffc779bd766619aa24242890539495bdac03bf28405e41ba087b9a8',
- remotes = {'ipv4 "vpn15.ffnord.net" port 10050', 'ipv6 "vpn15.ffnord.net" port 10050'},
+ remotes = {'ipv4 "vpn15.freifunknord.de" port 10050', 'ipv6 "vpn15.freifunknord.de" port 10050'},
},
},
},
@@ -224,23 +224,23 @@
},
},
mesh11s = {
- name = 'mesh11s',
- mirrors = {
- 'http://[2a03:2267:4e6f:7264::fd00]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd02]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd03]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd04]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd05]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd06]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd07]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd08]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd09]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd10]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd11]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd12]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd13]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd14]/firmware/mesh11s/sysupgrade/',
- 'http://[2a03:2267:4e6f:7264::fd15]/firmware/mesh11s/sysupgrade/',
+ name = 'mesh11s',
+ mirrors = {
+ 'http://[2a03:2267:4e6f:7264::fd00]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd02]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd03]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd04]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd05]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd06]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd07]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd08]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd09]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd10]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd11]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd12]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd13]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd14]/firmware/mesh11s/sysupgrade/',
+ 'http://[2a03:2267:4e6f:7264::fd15]/firmware/mesh11s/sysupgrade/',
},
probability = 0.1,
good_signatures = 1,
diff --git a/site.mk b/site.mk
index 6b22df2df96d269fbaebb6b026a3c2de285fa3f8..572a09135b273b168de06b1af576032a337cbbba 100644
--- a/site.mk
+++ b/site.mk
@@ -19,7 +19,9 @@ GLUON_SITE_PACKAGES := \
gluon-mesh-vpn-fastd \
gluon-radvd \
gluon-status-page \
- iwinfo \
+ gluon-quickfix \
+ gluon-ssid-changer \
+ iwinfo \
fastd-traffic-status \
iptables \
haveged