From patchwork Thu Jun 27 12:44:26 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [v3,3/7] fff-web: remove l2tp
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
X-Patchwork-Id: 1147
Message-Id: <20190627124430.1132-4-freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Date: Thu, 27 Jun 2019 14:44:26 +0200

From: Robert Langhammer <rlanghammer@web.de>

Signed-off-by: Robert Langhammer <rlanghammer@web.de>
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
[Bump PKG_RELEASE]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
---
 src/packages/fff/fff-web/Makefile                        | 2 +-
 src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile
index 0e3550f5..6bdd9cd0 100644
--- a/src/packages/fff/fff-web/Makefile
+++ b/src/packages/fff/fff-web/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-web
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
index 4d1cc93f..f18a3b4b 100755
--- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
+++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
@@ -22,11 +22,7 @@ if pidof fastd >/dev/null ; then
 else
 	vpn_active="inaktiv"
 fi
-if grep -q '1' /sys/class/net/l2tp*/carrier ; then
-	l2tp_active="aktiv"
-else
-	l2tp_active="inaktiv"
-fi
+
 up="$(uptime)"
 load="${up##*:}"
 uptime="${up%%,*}"
@@ -62,7 +58,6 @@ fi
 		<tr><th>Bekannte Knoten:</th><td><%= $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)+1)) %></td></tr>
 		<tr><th>Nachbarknoten:</th><td><%= $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null) %></td></tr>
 		<tr><th>VPN via fastd:</th><td><%= ${vpn_active} %></td></tr>
-		<tr><th>VPN via L2TP:</th><td><%= ${l2tp_active} %></td></tr>
 		<tr><th>Laufzeit:</th><td><%= ${uptime} %></td></tr>
 		<tr><th>Auslastung:</th><td><%= ${load} %></td></tr>
 		<tr><th>Uhrzeit:</th><td><% date %></td></tr>