From cf4ac59a86c193a2f5597d5f9244ba470561e547 Mon Sep 17 00:00:00 2001
From: creme <creme@envs.net>
Date: Fri, 6 Dec 2024 09:57:41 +0100
Subject: [PATCH] bump version to 1.6.2

---
 CHANGELOG.md                                     | 16 ++++++++++++++++
 init_server.sh                                   |  2 +-
 .../usr/local/bin/freifunk-manuell_update.sh     |  2 --
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92ae3d27..1e87aa29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,22 @@
 # Freifunk Dresden: ffdd-server - Changelog
 `current version:` ![calver](https://img.shields.io/github/v/release/freifunk-dresden/ffdd-server?include_prereleases)
 
+## version 1.6.2
+
+This release contains a fix **for Debian 11 (bullseye)**. Some required packages are missing from the saltstack installation and must be installed manually.
+These are: `python3-yaml`, `python3-msgpack`, `python3-distro`, `python3-tornado`, `python3-looseversion`, `python3-packaging` and `python3-jinja2`.  
+The problem seems to have arisen with the switch to the new salt repo in Version [T_RELEASE_v1.5.1rc1](https://github.com/Freifunk-Dresden/ffdd-server/releases/tag/T_RELEASE_v1.5.1rc1).  
+(new ffdd-server installations with Debian 11 and all other versions do not seem to be affected by this problem)
+
+To fix your current installation you just need to install the mentioned packages as follows:  
+`apt -y install python3-yaml python3-msgpack python3-distro python3-tornado python3-looseversion python3-packaging python3-jinja2`.  
+After installing the packages, `freifunk-call` should be executable again.
+
+	- fix debian 11 installation
+	- update digitalcourage dns forwarder also in default uci config
+	- add config option to disable the speedtest plugin
+	- revision/optimization of some scripts
+
 ## version 1.6.1
 	- update digitalcourage dns forwarder
 	- update bind (dns) zonefiles
diff --git a/init_server.sh b/init_server.sh
index 53b3a92d..eb2ede99 100755
--- a/init_server.sh
+++ b/init_server.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#version="1.6.1"
+#version="1.6.2"
 
 # check if user has set the environment variable REV, then use this
 REV="T_RELEASE_latest" # means git rev/branch/tag
diff --git a/salt/freifunk/base/ddmesh/usr/local/bin/freifunk-manuell_update.sh b/salt/freifunk/base/ddmesh/usr/local/bin/freifunk-manuell_update.sh
index adc714a7..27276ea6 100755
--- a/salt/freifunk/base/ddmesh/usr/local/bin/freifunk-manuell_update.sh
+++ b/salt/freifunk/base/ddmesh/usr/local/bin/freifunk-manuell_update.sh
@@ -19,8 +19,6 @@ CUSTOM_INSTALL_DIR="$(uci -qX get ffdd.sys.install_dir)"
 [ -n "$CUSTOM_INSTALL_DIR" ] && [ "$CUSTOM_INSTALL_DIR" != "$INSTALL_DIR" ] && INSTALL_DIR="$CUSTOM_INSTALL_DIR"
 
 
-if [ "$(id -u)" -ne 0 ]; then printf 'Please run as root!\n'; exit 1 ; fi
-
 [ -d "$INSTALL_DIR" ] && rm -rf "$INSTALL_DIR"
 git clone "$REPO_URL" "$INSTALL_DIR"
 cd "$INSTALL_DIR" && git checkout "$REV"