diff --git a/bash_history b/bash_history index 7dc5518..0bb5c34 100644 --- a/bash_history +++ b/bash_history @@ -21977,3 +21977,204 @@ cd config/ ls git checkout tj-dev exit +ssh gw-beta +exit +c +cd config/ +list +git diff +list +d +s +list +ls +cd con +cd config/ +git diff +git commit -am "cleanup config" +git push +ssh gw-beta +r +cd controller +ls +npm install --save nodemailer +r +cd api +git diff +git commit -am "whitespace" +git push +cd .. +cd controller/ +git diff +git commit -am "sign up email" +git push +git pull +r +sudo service nginx restart +r +grep "account not found" * -R +cd controller/ +grep "account not found" * -R +r +sudo service nginx restart +tail -f /var/log/nginx/*.log +exit +list +logs +l +cd api +cd .. +cd controller/ +npm remove --save nodemailer +npm install --save nodemailer@2.0.0 +l +exit +lsit +list +c +ls +./start_ap +./start_app +list +./start_port +./start_gate +./start_api +list +sudo service nginx restart +cd app +ls +gulp build +sudo service nginx restart +cd .. +ls -l +cd app +ls +ls -l +sudo service nginx restart +list +cd .. +ls +./start_pong +sudo service nginx restart +./start_editor_v +./start_editor_v1 +cd config/ +ls +cd .. +ls +rm start_editor_v* +ls +ln -s config/start_editor +ls +cd config/ +git commit -am "one config" +git push +git checkout gw-beta +ls -l +git merge tj-dev +git reset --hard HEAD +git checkout tj-dev +git push -u origin :gw-beta +git branch -D gw-beta +git branch gw-beta +git checkout gw-beta +ls +grep "tj-" * -R +grep "tj-" * -Rl | xargs sed -i "s/tj\-/beta\-/g" +git diff +git checkout tj-dev -- bash_history +git diff +grep "\/usr\/share\/gamewheel\/" * -R +grep "\/usr\/share\/gamewheel\/" * -R --exclude=bash_history +grep "\/usr\/share\/gamewheel\/" * -lR --exclude=bash_history | xargs sed -i "s/\/usr\/share\/gamewheel/\/home\/gamewheel\/app/" +git diff +git commit -am "beta config" +git pushg +git push +git push -u origin gw-beta +cd /etc/nginx/ +ls +cd .. +cd / +g +ls +ls -l +./update_all +cd api +ls +git diff +cd .. +cd controller/ +ls +git diff +git commit -am "mail controller" +git push +git pull +gitp ush +git push +cd .. +ls +cd api +git reset --hard HEAD +git pull +git commit -am "start mail signup" +git push +r +cd app/ +l +cd api +git dif +cd .. +cd app/ +ls +git diff +gulp build +bower install +gulp build +ssh gw-beta +r +list +sudo service nginx restart +r +list +r +d +start +s +ssh gw-bet +ssh gw-beta +exit +g +cd controller/ +ls +git commit -am "reset and changed mail" +git push +exit +c +cd controller/ +git commit -am "fixes" +git push +cd .. +cd ap +cd api +git diff +git commit -am "sign up mail" +git push +r +exit +ping portal.gamewheel.com +ssh gw-beta +ext +exit +ssh gw-beta +exit +start +s +exit +l +exit +list +m +r +m +exit diff --git a/inputrc b/inputrc new file mode 100644 index 0000000..5c40bf2 --- /dev/null +++ b/inputrc @@ -0,0 +1,4 @@ +"\e[A": history-search-backward +"\e[B": history-search-forward +"\e[1;5C": forward-word +"\e[1;5D": backward-word diff --git a/nginx/conf.d/ports.conf b/nginx/conf.d/ports.conf index 78304d7..c86ef8b 100644 --- a/nginx/conf.d/ports.conf +++ b/nginx/conf.d/ports.conf @@ -34,10 +34,22 @@ upstream port { server 127.0.0.1:3114; } +upstream gamestate { + server 127.0.0.1:3114; +} + upstream gate { server 127.0.0.1:3115; } +upstream content { + server 127.0.0.1:3115; +} + +upstream asset { + server 127.0.0.1:3115; +} + upstream php { server 127.0.0.1:9001; } \ No newline at end of file diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 6605763..e48cd8d 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -31,7 +31,7 @@ http { ## # Logging Settings ## - log_format custom_access '$request_method ($status) : $host$request_uri\n$request_filename'; + log_format custom_access '$request_method ($status) : $host$request_uri'; access_log /var/log/nginx/access.log custom_access; error_log /var/log/nginx/error.log; diff --git a/start b/start index 15ef190..a4924e1 100755 --- a/start +++ b/start @@ -4,3 +4,4 @@ cd /usr/share/gamewheel ./start_app ./start_gate ./start_port +./start_mail