Update to Gluon v2022.1.4 (#47)

FreifunkErfurt · Mar 20, 2024 · 97a640b · 97a640b
1 parent 20b77b0
commit 97a640b
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 21 deletions.
diff --git a/contrib/actions/install-dependencies.sh b/contrib/actions/install-dependencies.sh
@@ -5,7 +5,7 @@ set -e
 cp /home/runner/work/site-ffef/site-ffef/contrib/actions/sources.list /etc/apt/sources.list
 rm -rf /etc/apt/sources.list.d
 apt update
-apt install subversion build-essential libncurses-dev python2.7 python3 zlib1g-dev
+apt install subversion build-essential libncurses-dev python2.7 python3 qemu-utils zlib1g-dev
 apt clean
 rm -rf /var/lib/apt/lists/*
 dpkg -l

diff --git a/domains/ffef_v1.conf b/domains/ffef_v1.conf
@@ -43,11 +43,9 @@
   },
 
   mesh_vpn = {
-
-    mtu = 1426,
-
     fastd = {
       methods = {'null+salsa2012+umac'},
+      mtu = 1426,
       groups = {
         backbone = {
           limit = 1,

diff --git a/domains/ffen_v1.conf b/domains/ffen_v1.conf
@@ -43,11 +43,9 @@
   },
 
   mesh_vpn = {
-
-    mtu = 1426,
-
     fastd = {
       methods = {'null+salsa2012+umac'},
+      mtu = 1426,
       groups = {
         backbone = {
           limit = 1,

diff --git a/domains/ffgth_v1.conf b/domains/ffgth_v1.conf
@@ -43,11 +43,9 @@
   },
 
   mesh_vpn = {
-
-    mtu = 1426,
-
     fastd = {
       methods = {'null+salsa2012+umac'},
+      mtu = 1426,
       groups = {
         backbone = {
           limit = 1,

diff --git a/domains/ffil_v1.conf b/domains/ffil_v1.conf
@@ -43,11 +43,9 @@
   },
 
   mesh_vpn = {
-
-    mtu = 1426,
-
     fastd = {
       methods = {'null+salsa2012+umac'},
+      mtu = 1426,
       groups = {
         backbone = {
           limit = 1,

diff --git a/domains/ffthw_v1.conf b/domains/ffthw_v1.conf
@@ -43,11 +43,9 @@
   },
 
   mesh_vpn = {
-
-    mtu = 1426,
-
     fastd = {
       methods = {'null+salsa2012+umac'},
+      mtu = 1426,
       groups = {
         backbone = {
           limit = 1,

diff --git a/domains/ffwsee_v1.conf b/domains/ffwsee_v1.conf
@@ -43,11 +43,9 @@
   },
 
   mesh_vpn = {
-
-    mtu = 1426,
-
     fastd = {
       methods = {'null+salsa2012+umac'},
+      mtu = 1426,
       groups = {
         backbone = {
           limit = 1,

diff --git a/gluon b/gluon
diff --git a/site.mk b/site.mk
@@ -42,7 +42,7 @@ GLUON_SITE_PACKAGES := \
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 
-DEFAULT_GLUON_RELEASE := 2021.1.2.1
+DEFAULT_GLUON_RELEASE := 2022.1.4
 
 # Variables set with ?= can be overwritten from the command line