Merge branch 'master' into controls

This commit is contained in:
logsol 2014-12-25 11:46:48 +01:00
commit 950402a76e
2 changed files with 12 additions and 22 deletions

View file

@ -19,16 +19,6 @@
NODE_ENV: "production",
PORT: "1235"
}
},
// Development
{
name : "chuck-dev",
script : "server.js",
env : {
NODE_ENV: "dev",
PORT: "1234"
}
}
],
@ -47,14 +37,6 @@
repo : "https://github.com/logsol/chuck.js.git",
path : "/home/chuck/production",
"post-deploy" : "npm install && NODE_ENV=production sh scripts/build.sh && pm2 startOrRestart config/ecosystem.json5 --env production"
},
dev : {
user : "chuck",
host : "fuuuuu.de",
ref : "origin/controls",
repo : "https://github.com/logsol/chuck.js.git",
path : "/home/chuck/development",
"post-deploy" : "npm install && pm2 startOrRestart config/ecosystem.json5 --env dev",
}
}
}

View file

@ -1,10 +1,18 @@
#!/bin/bash
# Get dir of this script
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/..
if [ -z "$1" ]
then
pm2 deploy $DIR/config/ecosystem.json5 dev
else
pm2 deploy $DIR/config/ecosystem.json5 $1
pm2 deploy $DIR/config/ecosystem-dev.json5 dev
exit
fi
if [ "$1" == "production" ]
then
pm2 deploy $DIR/config/ecosystem.json5 production
exit
fi
echo "Case ($1) not defined. doing nothing."