update dist

3 years ago · 9e2f353ec8
20 changed files with 23 additions and 782 deletions
--- a/client/css/app.b5111772.css
+++ b/client/css/app.b5111772.css
--- a/client/css/chunk-vendors.b9dd8f74.css
+++ b/client/css/chunk-vendors.b9dd8f74.css
--- a/client/favicon.ico
+++ b/client/favicon.ico
--- a/client/fonts/themify.2c454669.eot
+++ b/client/fonts/themify.2c454669.eot
--- a/client/fonts/themify.a1ecc3b8.woff
+++ b/client/fonts/themify.a1ecc3b8.woff
--- a/client/fonts/themify.e23a7dca.ttf
+++ b/client/fonts/themify.e23a7dca.ttf
--- a/client/img/docker.7b56657d.png
+++ b/client/img/docker.7b56657d.png
--- a/client/img/hybrid-1.852eef88.png
+++ b/client/img/hybrid-1.852eef88.png
--- a/client/img/loading.f4404720.gif
+++ b/client/img/loading.f4404720.gif
--- a/client/img/themify.9c8e96ec.svg
+++ b/client/img/themify.9c8e96ec.svg
--- a/client/img/venus1.826d0774.png
+++ b/client/img/venus1.826d0774.png
--- a/client/img/warning.f9cebb9b.png
+++ b/client/img/warning.f9cebb9b.png
--- a/client/index.html
+++ b/client/index.html
@ -1 +0,0 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><title>Vue App</title><link href=/css/app.b5111772.css rel=preload as=style><link href=/css/chunk-vendors.b9dd8f74.css rel=preload as=style><link href=/js/app.928e7c0e.js rel=preload as=script><link href=/js/chunk-vendors.f00828c9.js rel=preload as=script><link href=/css/chunk-vendors.b9dd8f74.css rel=stylesheet><link href=/css/app.b5111772.css rel=stylesheet></head><body><div id=app></div><script src=/js/chunk-vendors.f00828c9.js></script><script src=/js/app.928e7c0e.js></script></body></html>
--- a/client/js/app.928e7c0e.js
+++ b/client/js/app.928e7c0e.js
--- a/client/js/app.928e7c0e.js.map
+++ b/client/js/app.928e7c0e.js.map
--- a/client/js/chunk-vendors.f00828c9.js
+++ b/client/js/chunk-vendors.f00828c9.js
--- a/client/js/chunk-vendors.f00828c9.js.map
+++ b/client/js/chunk-vendors.f00828c9.js.map
--- a/hybrid/scripts/check-wg-connection.sh
+++ b/hybrid/scripts/check-wg-connection.sh
@ -1,13 +1,31 @@
 #!/bin/bash

-
+declare -a wgint
+for fint in $(docker inspect --format '{{.HostConfig.NetworkMode}}' $(docker ps --format '{{ .Names }}') |  grep "^swlab"); do
+	#echo $fint
+	ff=$fint
+	ff="${ff#"${ff%%[![:space:]]*}"}"
+	ff="${ff%"${ff##*[![:space:]]}"}"
+	ff=${ff:5}
+	#echo $ff
+	wgint+=($ff)
+done
 for f in /sys/class/net/swlab*; do
    if [ -L "$f" ]; then
-	#echo $f
 	f=$(basename $f)
 	f="${f#"${f%%[![:space:]]*}"}"
 	f="${f%"${f##*[![:space:]]}"}"
 	f=${f:5}
+	f=$(basename $f)
+	#echo $f
+	wgint+=($f)
+    fi
+done
+
+
+#echo "---------------"
+for f in "${wgint[@]}"; do 
+	#for fdir in ./hybrid/connect/$f*; do
 	for fdir in /config/$f*; do
 	    if [[ -d "$fdir" && ! -L "$fdir" ]]; then
 		fdirfull=$fdir
@ -87,7 +105,6 @@ for f in /sys/class/net/swlab*; do
 		    fi
 	    fi
 	done
-    fi
 done

 echo [$JSON] 
--- a/llo/connect-new.js
+++ b/llo/connect-new.js
@ -535,7 +535,7 @@ app.get('/getserviceshybridstatus', (req, res, next) => {
 app.get('/getwginterfaces', (req, res, next) => {

    var mypath = process.cwd()
-    var mongoserver = JSON.parse(fs.readFileSync('./hybrid/venus-stats/config.json', 'utf8'))
+    //var mongoserver = JSON.parse(fs.readFileSync('./hybrid/venus-stats/config.json', 'utf8'))
 		var showexec = `docker exec  swlabadminvenus /bin/bash -c "/usr/local/bin/check-wg-connection.sh"`
    var RES = new Object();
    const page    	= req.query["page"]
--- a/2
+++ b/2
@ -71,6 +71,7 @@ port=$(EPHEMERAL_PORT)
 coll=logs
 ip='127.0.0.1'
 venusadmin=$wdir/hybrid/connect
+venusint=$wdir/hybrid/scripts/check-wg-connection.sh


 cat << FOE > $wdir/hybrid/venus-stats/.env
@ -85,6 +86,7 @@ MONGO_VENUS_IP=$ip
 MONGO_VENUS_PORT=$port
 MONGO_VENUS_COLLECTION=$coll
 VENUSADMIN=$venusadmin
+VENUSINT=$venusint
 FOE
			`@ -1 +0,0 @@`
			<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><title>Vue App</title><link href=/css/app.b5111772.css rel=preload as=style><link href=/css/chunk-vendors.b9dd8f74.css rel=preload as=style><link href=/js/app.928e7c0e.js rel=preload as=script><link href=/js/chunk-vendors.f00828c9.js rel=preload as=script><link href=/css/chunk-vendors.b9dd8f74.css rel=stylesheet><link href=/css/app.b5111772.css rel=stylesheet></head><body><div id=app></div><script src=/js/chunk-vendors.f00828c9.js></script><script src=/js/app.928e7c0e.js></script></body></html>