swarmlab
/
venus-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

update dist

master
zeus 4 years ago
parent
f41c818ae8
commit
2c0bc100e5
18 changed files with 24 additions and 780 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      client/css/app.b5111772.css
  2. 9
      client/css/chunk-vendors.b9dd8f74.css
  3. BIN
      client/favicon.ico
  4. BIN
      client/fonts/themify.2c454669.eot
  5. BIN
      client/fonts/themify.a1ecc3b8.woff
  6. BIN
      client/fonts/themify.e23a7dca.ttf
  7. BIN
      client/img/docker.7b56657d.png
  8. BIN
      client/img/hybrid-1.852eef88.png
  9. BIN
      client/img/loading.f4404720.gif
  10. 362
      client/img/themify.9c8e96ec.svg
  11. BIN
      client/img/venus1.826d0774.png
  12. BIN
      client/img/warning.f9cebb9b.png
  13. 1
      client/index.html
  14. 2
      client/js/app.25c18fe2.js
  15. 1
      client/js/app.25c18fe2.js.map
  16. 394
      client/js/chunk-vendors.f00828c9.js
  17. 1
      client/js/chunk-vendors.f00828c9.js.map
  18. 26
      llo/connect-new.js

8
client/css/app.b5111772.css
View File

File diff suppressed because one or more lines are too long

9
client/css/chunk-vendors.b9dd8f74.css
View File

File diff suppressed because one or more lines are too long

BIN
client/favicon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
client/fonts/themify.2c454669.eot
View File

Binary file not shown.

BIN
client/fonts/themify.a1ecc3b8.woff
View File

Binary file not shown.

BIN
client/fonts/themify.e23a7dca.ttf
View File

Binary file not shown.

BIN
client/img/docker.7b56657d.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
client/img/hybrid-1.852eef88.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
client/img/loading.f4404720.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 17 KiB

362
client/img/themify.9c8e96ec.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 229 KiB

BIN
client/img/venus1.826d0774.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 80 KiB

BIN
client/img/warning.f9cebb9b.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.8 KiB

1
client/index.html
View File

@ -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.25c18fe2.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.25c18fe2.js></script></body></html>

2
client/js/app.25c18fe2.js
View File

File diff suppressed because one or more lines are too long

1
client/js/app.25c18fe2.js.map
View File

File diff suppressed because one or more lines are too long

394
client/js/chunk-vendors.f00828c9.js
View File

File diff suppressed because one or more lines are too long

1
client/js/chunk-vendors.f00828c9.js.map
View File

File diff suppressed because one or more lines are too long

26
llo/connect-new.js
View File

@ -236,6 +236,7 @@ async function wg_save_connect_linux(res) {
res.netmask res.netmask
res.privatekey res.privatekey
res.allowedips res.allowedips
res.network_mode
res.interfaceip res.interfaceip
res.endpointfpath res.endpointfpath
mongoconfig mongoconfig
@ -245,9 +246,29 @@ export NODE_PATH=$(npm root --quiet -g)
try { try {
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 NETWORK_MODE=''
if(res.network_mode){
var WGNETWORK_NAME=''
NETWORK_MODE=' --net=host '
NETWORK_MODE_CREATE='no'
}else{
var WGNETWORK_NAME=`swlab${res.bootstrapstackid.slice(0, 10)}`
NETWORK_MODE=` --net=${WGNETWORK_NAME}`
NETWORK_MODE_CREATE='yes'
}
const myExec = ` const myExec = `
NETWORK_MODE_CREATE=${NETWORK_MODE_CREATE}
if [ "\$NETWORK_MODE_CREATE" = 'yes' ]; then
NETWORK_NAME=${WGNETWORK_NAME}
docker network ls --filter name=^\${NETWORK_NAME}$ --format="{{ .Name }}"
if [ -z \$(docker network ls --filter name=^\${NETWORK_NAME}$ --format="{{ .Name }}") ] ; then
docker network create \${NETWORK_NAME} ;
fi
fi
docker exec swarmlabwg-${res.bootstrapstackid} /bin/bash -c "ip link set ${DEV_NAME} down; ip link del ${DEV_NAME}" docker exec swarmlabwg-${res.bootstrapstackid} /bin/bash -c "ip link set ${DEV_NAME} down; ip link del ${DEV_NAME}"
sleep 1 sleep 1
docker stop swarmlabwg-${res.bootstrapstackid}; docker container rm swarmlabwg-${res.bootstrapstackid} docker stop swarmlabwg-${res.bootstrapstackid}; docker container rm swarmlabwg-${res.bootstrapstackid}
@ -255,7 +276,7 @@ sleep 1
docker pull hub.swarmlab.io:5480/venusclient:latest docker pull hub.swarmlab.io:5480/venusclient:latest
sleep 1 sleep 1
docker run -d \ docker run -d \
--net=host \ ${NETWORK_MODE} \
--name=swarmlabwg-${res.bootstrapstackid} \ --name=swarmlabwg-${res.bootstrapstackid} \
--cap-add=NET_ADMIN \ --cap-add=NET_ADMIN \
--cap-add=SYS_MODULE \ --cap-add=SYS_MODULE \
@ -319,6 +340,7 @@ app.post('/hybrid_join_start', (req, res, next) => {
RES.netmask = req.body["netmask"] RES.netmask = req.body["netmask"]
RES.privatekey = req.body["privatekey"] RES.privatekey = req.body["privatekey"]
RES.allowedips = req.body["allowedips"] RES.allowedips = req.body["allowedips"]
RES.network_mode = req.body["network_mode"]
RES.interfaceip = req.body["peer_ip"] RES.interfaceip = req.body["peer_ip"]
RES.endpointfpath = `${RES.serverip}:${RES.endpoint}` RES.endpointfpath = `${RES.serverip}:${RES.endpoint}`
RES.dev_name = `swlab${RES.bootstrapstackid.slice(0, 10)}` RES.dev_name = `swlab${RES.bootstrapstackid.slice(0, 10)}`
@ -472,7 +494,7 @@ app.get('/getserviceshybridstatus', (req, res, next) => {
var RES = new Object(); var RES = new Object();
RES.bootstrapnameid = req.query["bootstrapnameid"] RES.bootstrapnameid = req.query["bootstrapnameid"]
RES.bootstrapstackname = req.query["bootstrapstackname"] RES.bootstrapstackname = req.query["bootstrapstackname"]
var showexec = `docker ps --format '{"Names":"{{ .Names }}", "Status":"{{.Status}}"}' | jq . -s ` var showexec = `docker ps --format '{"Names":"{{ .Names }}", "Status":"{{.Status}}", "Networks":"{{.Networks}}" }' | jq . -s `
exec(showexec, (err, stdout, stderr) => { exec(showexec, (err, stdout, stderr) => {
if (err) { if (err) {
console.error(`exec error: ${err}`); console.error(`exec error: ${err}`);

Write Preview
Loading…
Cancel
Save