diff --git a/bash_aliases b/bash_aliases index 2719440..e7d0df0 100644 --- a/bash_aliases +++ b/bash_aliases @@ -1,7 +1,6 @@ alias c='cd /usr/share/gamewheel' alias s='cd /usr/share/gamewheel && ./start' alias d='cd /usr/share/gamewheel && ./delete' -alias r='cd /usr/share/gamewheel && ./restart' alias st='cd /usr/share/gamewheel && ./stop' alias g='cd /usr/share/gamewheel' alias p='cd /usr/share/gamewheel/3d-pong' @@ -16,3 +15,7 @@ alias e1='cd /usr/share/gamewheel && ./start_editor' alias logs='cd /usr/share/gamewheel && ./logs' alias m='pm2 monit' alias list='pm2 list' +function r() { + /usr/share/gamewheel/restart "$@" +} +export -f r diff --git a/bash_history b/bash_history index ed37cd2..ad84eb0 100644 --- a/bash_history +++ b/bash_history @@ -23513,3 +23513,218 @@ exit ssh gw-new r ssh gw-new +c +cd config/ +git diff +git checkout gw-new +git commit -am "stuff" +git push +git checkout gw-new +git pull +git checkout tj-dev -- build_latest +git commit -am "build latest" +git push +git checkout tj-dev +l +exit +r +exit +ssh gw-new +c +./update_all +cd app/ +git commit -am "fix" +git push +r +cd app +gulp build +[12:58:15] gulp-debug: src/app/sections/user/user.route.js +r +cd controller/ +git pull +r +cd model/ +git pull +r +./update_all +vim update_all +./update_all +cp update_all build_latest +vim update_all +vim build_latest +cd 3d-racing +npm install gulp-concat +gulp build +npm install gulp-uglify +gulp build +npm i -g npm +sudo npm i -g npm +cd .. +ls +vim build_latest +./build_latest +s +ls +r +vim build_latest +ls +mv build_latest config/ +ln -s config/build_latest +cd config/ +git add build_latest +git status +git diff +git commit -am "new files" +git push +git diff +ls +cd .. +cd app +ls +gulp build +cd .. +vim build_latest +r +./build_latest +cd helper/ +git diff +git commit -am "semicolons" +git push +git diff +git commit -am "more semicolons, type coersion" +git push +git pull +cd .. +cd config/ +ls +vim bash_aliases +vim build_latest +./build_latest +vim bash_aliases +vim build_latest +exit +r +exit +ssh gw-new +exit +c +./build_latest +vim build_latest +./build_latest +cd app +git diff +git status +# +ls +git status +cd .. +./build_latest +ssh gw-new +exit +ssh gw-new +exit +c +vim build_latest +./build_latest +exit +c +cd config/ +git checkout gw-new +git status +git diff +git rm --cached bash_history +git status +git diff +git commit -am "update" +git push +git checkout gw-new +git add bash_history +git commit -am "bash_hoist" +git push +git checkout gw-new +git diff +git commit -am "release database" +git push +git checkout tj-dev +ssh gw-new +exit +s +m +exit +ssh gw-new +s +exit +mysql +exit +3d +gulp +cd .. +cd cron/ +node server.js +exit +c +cd app +git status +s +ls -l +git clone git@github.com:ToywheelDev/gamewheel-cron.git cron +cd cron/ +ls +ls -l +ls +git branch develop +git checkout dev +git checkout develop +ls +git push -u origin master +git pull +git status +touch package.json +git add package.json +git commit -am "initial package.json" +git push +git branch develop +git checkout develop +ls +npm install node-cron +npm install --save cron +ls +rm package.json +npm install --save cron +ls +cd ap +cd .. +ls +cd api +ls +cd .. +ls +cd cron/ +ls +exit +c +cd 3d +3d +ls +git diff +git commit -am "more updates - visual" +git push +cd .. +cd game-lib/ +git diff +git commit -am "child objects don't instantiate parent objects" +git push +cd .. +cd blender-node/ +git diff +git commit -am "there can be only one game-lib" +git push +cd .. +ls +cd api-v1/ +git diff +git commit -am "fix config path" +git push +cd .. +ls +exit diff --git a/config.js b/config.js index 9974881..3726d24 100644 --- a/config.js +++ b/config.js @@ -47,6 +47,9 @@ var config = { port: { url: 'https://tj-port.gamewheel.com' }, + cron: { + url: 'https://tj-cron.gamewheel.com' + }, environment: { mode: 'development' } diff --git a/hosts b/hosts index a69e596..3129451 100644 --- a/hosts +++ b/hosts @@ -17,6 +17,7 @@ 127.0.1.1 tj-api.gamewheel.com 127.0.1.1 tj-cdn.gamewheel.com 127.0.1.1 tj-mail.gamewheel.com +127.0.1.1 tj-cron.gamewheel.com # The following lines are desirable for IPv6 capable hosts ::1 ip6-localhost ip6-loopback diff --git a/nginx/conf.d/ports.conf b/nginx/conf.d/ports.conf index 5ddffc5..352a9dd 100644 --- a/nginx/conf.d/ports.conf +++ b/nginx/conf.d/ports.conf @@ -50,6 +50,10 @@ upstream asset { server 127.0.0.1:3115; } +upstream cron { + server 127.0.0.1:3116; +} + upstream php { server 127.0.0.1:9001; } \ No newline at end of file diff --git a/secure.js b/secure.js index 055ee9e..a12eef4 100644 --- a/secure.js +++ b/secure.js @@ -125,6 +125,10 @@ var secure = { gate: { port: 3115, debugPort: 3215 + }, + cron: { + port: 3116, + debugPort: 3216 } }; diff --git a/start b/start index 9d5477b..af6bc6b 100755 --- a/start +++ b/start @@ -6,3 +6,4 @@ cd /usr/share/gamewheel ./start_gate ./start_port ./start_mail +./start_cron diff --git a/start_cron b/start_cron new file mode 100755 index 0000000..5b0a7ff --- /dev/null +++ b/start_cron @@ -0,0 +1,3 @@ +#!/bin/bash +cd /usr/share/gamewheel/cron +pm2 start server.js --node-args="--debug=3216" --name cron \ No newline at end of file