| Message ID | 20190625123336.21719-2-rlanghammer@web.de |
|---|---|
| State | Superseded |
| Headers | show |
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 4d1cc93..f18a3b4 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>
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Bitte Version noch anpassen: - PKG_RELEASE:=8 + PKG_RELEASE:=9 Grüße Adrian > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of > Robert Langhammer > Sent: Dienstag, 25. Juni 2019 14:34 > To: franken-dev@freifunk.net > Subject: [PATCH 1/4] fff-web: remove l2tp > > Signed-off-by: Robert Langhammer <rlanghammer@web.de> > --- > src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > 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 4d1cc93..f18a3b4 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> > -- > 2.20.1
Signed-off-by: Robert Langhammer <rlanghammer@web.de> --- src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- 2.20.1