From 2a976f607a2bdb7ba28e2de2f773d71701f0ab91 Mon Sep 17 00:00:00 2001 From: Dan Date: Fri, 3 Nov 2017 10:58:32 -0600 Subject: [PATCH] Edit port number --- Server/bin/start | 2 +- Server/bin/start_test | 2 +- Server/src/app.js | 8 ++++++-- git-post-receive | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Server/bin/start b/Server/bin/start index 736f1f0..a4603fd 100644 --- a/Server/bin/start +++ b/Server/bin/start @@ -1,5 +1,5 @@ #!/bin/sh /sbin/pidof /home/ofbbutte/webapps/ofb_angular/bin/node > /dev/null 2>&1 && exit 0 mkdir -p /home/ofbbutte/webapps/ofb_angular/run -nohup /home/ofbbutte/webapps/ofb_angular/bin/node /home/ofbbutte/webapps/ofb_angular/src/app.js > /dev/null 2>&1 & +nohup /home/ofbbutte/webapps/ofb_angular/bin/node /home/ofbbutte/webapps/ofb_angular/src/app.js 25776 > /dev/null 2>&1 & /sbin/pidof /home/ofbbutte/webapps/ofb_angular/bin/node > /home/ofbbutte/webapps/ofb_angular/run/node.pid diff --git a/Server/bin/start_test b/Server/bin/start_test index a0549bd..b60043a 100644 --- a/Server/bin/start_test +++ b/Server/bin/start_test @@ -1,5 +1,5 @@ #!/bin/sh /sbin/pidof /home/ofbbutte/webapps/ofb_angular_test/bin/node > /dev/null 2>&1 && exit 0 mkdir -p /home/ofbbutte/webapps/ofb_angular_test/run -nohup /home/ofbbutte/webapps/ofb_angular_test/bin/node /home/ofbbutte/webapps/ofb_angular_test/src/app.js > /dev/null 2>&1 & +nohup /home/ofbbutte/webapps/ofb_angular_test/bin/node /home/ofbbutte/webapps/ofb_angular_test/src/app.js 27606 > /dev/null 2>&1 & /sbin/pidof /home/ofbbutte/webapps/ofb_angular_test/bin/node > /home/ofbbutte/webapps/ofb_angular_test/run/node.pid diff --git a/Server/src/app.js b/Server/src/app.js index cb9796b..d6c3bee 100644 --- a/Server/src/app.js +++ b/Server/src/app.js @@ -1,3 +1,7 @@ +var port = 25776; +if (process.argv.length >= 3){ + port = process.argv[2]; +} const express = require('express'); const app = express(); var bodyParser = require("body-parser"); @@ -27,7 +31,7 @@ app.get('/*', function (req, res) { res.sendFile(path.join(__dirname, '../www', 'index.html')); }) -app.listen(25776, function () { - console.log('listening on port 25776!'); +app.listen(port, function () { + console.log('listening on port '+ port +'!'); }) diff --git a/git-post-receive b/git-post-receive index 3e133df..ff01d38 100644 --- a/git-post-receive +++ b/git-post-receive @@ -2,7 +2,7 @@ BRANCH=$1 BUILD_ANGULAR_ARG=$2 -BUILD_ANGULAR=true +BUILD_ANGULAR=false if [ "$BUILD_ANGULAR_ARG" = -ng ]; then BUILD_ANGULAR=true fi