diff --git a/docker/Dockerfile b/docker/Dockerfile index 67ce26fd..b1fc9699 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,11 +14,12 @@ RUN adduser --quiet meshserver \ && chmod +x /startmeshcentral.sh \ && su - meshserver \ && cd /home/meshserver \ - && npm install meshcentral node-7z greenlock-cli + && npm install meshcentral node-7z ENV PORT 443 ENV REDIRPORT 80 +ENV MPSPORT 4443 -EXPOSE 80 443 25 +EXPOSE 25 80 443 4443 ENTRYPOINT ["/startmeshcentral.sh"] diff --git a/docker/startmeshcentral.sh b/docker/startmeshcentral.sh index b4ca739b..380368eb 100644 --- a/docker/startmeshcentral.sh +++ b/docker/startmeshcentral.sh @@ -1,6 +1,7 @@ #!/bin/sh export PORT export REDIRPORT +export MPSPORT if [ "$1" != "" ] ; then PORT=$1 @@ -10,6 +11,10 @@ if [ "$2" != "" ]; then REDIRPORT=$2 fi +if [ "$3" != "" ]; then + MPSPORT=$3 +fi + su - meshserver cd /home/meshserver/ npm install meshcentral @@ -23,10 +28,10 @@ if [ -f "/etc/letsencrypt/archive/$HOSTNAME/cert1.pem" ]; then ln -sf "/etc/letsencrypt/archive/$HOSTNAME/cert1.pem" meshcentral-data/webserver-cert-public.crt ln -sf "/etc/letsencrypt/archive/$HOSTNAME/privkey1.pem" meshcentral-data/mpsserver-cert-private.key ln -sf "/etc/letsencrypt/archive/$HOSTNAME/cert1.pem" meshcentral-data/mpsserver-cert-public.crt - node node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT + node node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT --mpsport $MPSPORT elif ! [ -f meshcentral-data/agentserver-cert-private.key ] ;then - node node_modules/meshcentral/meshcentral.js --cert $HOSTNAME --port $PORT --redirport $REDIRPORT + node node_modules/meshcentral/meshcentral.js --cert $HOSTNAME --port $PORT --redirport $REDIRPORT --mpsport $MPSPORT else - node node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT + node node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT --mpsport $MPSPORT fi \ No newline at end of file diff --git a/startmeshcentral.sh b/startmeshcentral.sh index c74fd5d5..f54f1d44 100644 --- a/startmeshcentral.sh +++ b/startmeshcentral.sh @@ -1,16 +1,22 @@ #!/bin/sh if [ "$1" == "" ] ; then - PORT=444 + PORT=443 else PORT=$1 fi if [ "$2" == "" ]; then - REDIRPORT=81 + REDIRPORT=80 else REDIRPORT=$2 fi +if [ "$3" == "" ]; then + MPSPORT=4443 +else + MPSPORT=$3 +fi + su - meshserver cd /home/meshserver/ npm install meshcentral @@ -24,10 +30,10 @@ if [ -f ssl.key ]; then ln -sf ssl.cert meshcentral-data/webserver-cert-public.crt ln -sf ssl.key meshcentral-data/mpsserver-cert-private.key ln -sf ssl.cert meshcentral-data/mpsserver-cert-public.crt - forever start node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT + forever start node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT --mpsport $MPSPORT elif ! [ -f meshcentral-data/agentserver-cert-private.key ] ;then - forever start node_modules/meshcentral/meshcentral.js --cert $HOSTNAME --port $PORT --redirport $REDIRPORT + forever start node_modules/meshcentral/meshcentral.js --cert $HOSTNAME --port $PORT --redirport $REDIRPORT --mpsport $MPSPORT else - forever start node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT + forever start node_modules/meshcentral/meshcentral.js --port $PORT --redirport $REDIRPORT --mpsport $MPSPORT fi \ No newline at end of file