MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-06 11:18:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix runtime errors

Browse Source
This commit is contained in:
Lawrence 2018-01-13 13:18:00 -05:00
parent 80b03e27fb
commit 501845e412
2 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker/startmeshcentral.sh
View File

@ -2,11 +2,11 @@
export PORT export PORT
export REDIRPORT export REDIRPORT
if [ $1 != "" ] ; then if [ "$1" != "" ] ; then
PORT=$1 PORT=$1
fi fi
if [ $2 != "" ]; then if [ "$2" != "" ]; then
REDIRPORT=$2 REDIRPORT=$2
fi fi
@ -16,11 +16,7 @@ npm install meshcentral
if ! [ -f node_modules/.meshcentral-data/agentserver-cert-private.key ] ;then if ! [ -f node_modules/.meshcentral-data/agentserver-cert-private.key ] ;then
forever start node_modules/meshcentral/meshcentral.js --cert $HOSTNAME forever start node_modules/meshcentral/meshcentral.js --cert $HOSTNAME
sleep 10 elif [ -f ssl.key ]; then
forever stop node_modules/meshcentral/meshcentral.js
fi
if [ -f ssl.key ]; then
ln -sf ssl.key node_modules/.meshcentral-data/agentserver-cert-private.key ln -sf ssl.key node_modules/.meshcentral-data/agentserver-cert-private.key
ln -sf ssl.cert node_modules/.meshcentral-data/agentserver-cert-public.crt ln -sf ssl.cert node_modules/.meshcentral-data/agentserver-cert-public.crt
ln -sf ssl.key node_modules/.meshcentral-data/root-cert-private.key ln -sf ssl.key node_modules/.meshcentral-data/root-cert-private.key
@ -29,7 +25,7 @@ if [ -f ssl.key ]; then
ln -sf ssl.cert node_modules/.meshcentral-data/webserver-cert-public.crt ln -sf ssl.cert node_modules/.meshcentral-data/webserver-cert-public.crt
ln -sf ssl.key node_modules/.meshcentral-data/mpsserver-cert-private.key ln -sf ssl.key node_modules/.meshcentral-data/mpsserver-cert-private.key
ln -sf ssl.cert node_modules/.meshcentral-data/mpsserver-cert-public.crt ln -sf ssl.cert node_modules/.meshcentral-data/mpsserver-cert-public.crt
else
forever start node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT
fi fi
forever start node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT

30
startmeshcentral.sh
View File

@ -1,22 +1,13 @@
#!/bin/sh #!/bin/sh
if [ $1 == "" ] ; then if [ "$1" == "" ] ; then
PORT=444 PORT=444
else else
PORT=$1 PORT=$1
fi fi
if [ $2 == "" ]; then if [ "$2" == "" ]; then
RPORT=81 REDIRPORT=81
else else
RPORT=$2
fi
if [ $1 != "" ] ; then
PORT=$1
fi
if [ $2 != "" ]; then
REDIRPORT=$2 REDIRPORT=$2
fi fi
@ -25,12 +16,8 @@ cd /home/meshcentral/
npm install meshcentral npm install meshcentral
if ! [ -f node_modules/.meshcentral-data/agentserver-cert-private.key ] ;then if ! [ -f node_modules/.meshcentral-data/agentserver-cert-private.key ] ;then
forever start node_modules/meshcentral/meshcentral.js --cert $HOSTNAME forever start node_modules/meshcentral/meshcentral.js --cert $HOSTNAME --port $PORT --redirport $REDIRPORT
sleep 10 elif [ -f ssl.key ]; then
forever stop node_modules/meshcentral/meshcentral.js
fi
if [ -f ssl.key ]; then
ln -sf ssl.key node_modules/.meshcentral-data/agentserver-cert-private.key ln -sf ssl.key node_modules/.meshcentral-data/agentserver-cert-private.key
ln -sf ssl.cert node_modules/.meshcentral-data/agentserver-cert-public.crt ln -sf ssl.cert node_modules/.meshcentral-data/agentserver-cert-public.crt
ln -sf ssl.key node_modules/.meshcentral-data/root-cert-private.key ln -sf ssl.key node_modules/.meshcentral-data/root-cert-private.key
@ -38,8 +25,9 @@ if [ -f ssl.key ]; then
ln -sf ssl.key node_modules/.meshcentral-data/webserver-cert-private.key ln -sf ssl.key node_modules/.meshcentral-data/webserver-cert-private.key
ln -sf ssl.cert node_modules/.meshcentral-data/webserver-cert-public.crt ln -sf ssl.cert node_modules/.meshcentral-data/webserver-cert-public.crt
ln -sf ssl.key node_modules/.meshcentral-data/mpsserver-cert-private.key ln -sf ssl.key node_modules/.meshcentral-data/mpsserver-cert-private.key
ln -sf ssl.cert node_modules/.meshcentral-data/mpsserver-cert-public.crt ln -sf ssl.cert node_modules/.meshcentral-data/mpsserver-cert-public.crt
forever start node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT
else
forever start node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT
fi fi
forever start node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT