refactorign

beta.r3js.org
Theunis J. Botha 2017-03-21 15:42:58 +01:00
parent fac7388841
commit a5ac5f931c
30 changed files with 199 additions and 241 deletions

View File

@ -7,10 +7,6 @@ alias g='cd /usr/share/gamewheel'
alias p='cd /usr/share/gamewheel/3d-pong'
alias 3d='cd /usr/share/gamewheel/3d-editor'
alias gl='cd /usr/share/gamewheel/game-lib'
alias 3d2='cd /usr/share/gamewheel/3d-editor-v2'
alias gl2='cd /usr/share/gamewheel/game-lib-v2'
alias 3d3='cd /usr/share/gamewheel/3d-editor-v3'
alias gl3='cd /usr/share/gamewheel/game-lib-v3'
alias ps='cd /usr/share/gamewheel && ./start_pong'
alias api='cd /usr/share/gamewheel && ./start_api'
alias app='cd /usr/share/gamewheel && ./start_app'

View File

@ -2245,8 +2245,8 @@ ls
git clone git@github.com:ToywheelDev/GA_archery.git
git clone git@github.com:ToywheelDev/GA_ScratchCard.git
cd /srv/
mv gamewheel.com gamewheel.local
sudo mv gamewheel.com gamewheel.local
mv gamewheel.com gamewheel.com
sudo mv gamewheel.com gamewheel.com
ls
exit
mysql
@ -2327,7 +2327,7 @@ cd certs/
ls | grep snake
sudo service nginx restart
tail -f /var/log/nginx/error.log
cd /srv/gamewheel.local/games/
cd /srv/gamewheel.com/games/
ls
cd ..
ls
@ -2428,7 +2428,7 @@ sudo vim api-runtime.conf
cd /etc/vim/
ls
ls -l
sudo ln -s ~/config/vimrc.local
sudo ln -s ~/config/vimrc.com
ls -l
vim
cd /etc/nginx/sites-enabled/
@ -2531,7 +2531,7 @@ sudo vim /etc/nginx/sites-enabled/api.conf
exit
hostname
sudo vim /etc/hosts
ping app.gamewheel.local
tj-ping app.gamewheel.com
ls
sudo service nginx restart
exit
@ -2583,7 +2583,7 @@ ls
cd ..
ls
node server.js
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
cd games/
ls
@ -2665,7 +2665,7 @@ ls
git diff
cd ..
ls
cd /srv/gamewheel.local/games/
cd /srv/gamewheel.com/games/
ls
cd templates/
ls
@ -2785,7 +2785,7 @@ mysql
exit
cd /srv/
ls
cd gamewheel.local/
cd gamewheel.com/
ls
ln -s /usr/share/gamewheel/www/
ls
@ -2811,7 +2811,7 @@ vim api.conf
sudo vim api.conf
cd /srv/
ls
cd gamewheel.local/
cd gamewheel.com/
ls
ln -s /usr/share/gamewheel/GW_Config api
ls
@ -2898,7 +2898,7 @@ mv gamewheel.com www
cd www
ls
vim wp-config.php
vim /etc/vim/vimrc.local
vim /etc/vim/vimrc.com
ls
vim wp-config.php
mysql
@ -3060,8 +3060,8 @@ vim /etc/nginx/sites-enabled/www.conf
sudo vim /etc/nginx/sites-enabled/www.conf
sudo service nginx restart
ls -l
rm www.gamewheel.com.*
sudo rm www.gamewheel.com.*
tj-rm www.gamewheel.com.*
tj-sudo rm www.gamewheel.com.*
ls -l
sudo service nginx restart
ls
@ -3135,7 +3135,7 @@ ls -l
sudo mv composer.phar /usr/local/bin/
php composer.phar
sudo mv /usr/local/bin/composer.phar /usr/share/gamewheel/core/
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
cd core
ls
@ -3144,7 +3144,7 @@ php composer.phar install
exit
cd /usr/share/gamewheel/
ls
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
mv core /usr/share/gamewheel/
ls -l
@ -3199,11 +3199,11 @@ sudo ls
ld -l
sudo su
exit
wget http://www.woopra.com/track/ce/?host=gamewheel-analytics-test.com&cookie=7IG7s0grtihs&ip=127.0.0.1&timeout=300000&referer=&event=wp+article&app=wordpress&cv_name=tj&cv_email=tj@gamewheel.com&cv_admin=1&ce_author=TJ&ce_category=Something&ce_permalink=http%3A%2F%2Fwww.gamewheel.local%2Fstories%2Foracle&ce_title=Some+Title&ce_post_date=1458656400000
wget http://www.woopra.com/track/ce/?host=gamewheel-analytics-test.com&cookie=7IG7s0grtihs&ip=127.0.0.1&timeout=300000&referer=&event=wp+custom&app=wordpress&cv_name=tj&cv_email=tj@gamewheel.com&cv_admin=1&ce_author=TJ&ce_category=Something&ce_permalink=http%3A%2F%2Fwww.gamewheel.local%2Fstories%2Foracle&ce_title=Some+Title&ce_post_date=1458656400000
wget http://www.woopra.com/track/ce/?host=gamewheel.com&cookie=7IG7s08rtihs&ip=127.0.0.1&timeout=300000&referer=&event=wp+custom&app=wordpress&cv_name=tj&cv_email=tj@gamewheel.com&cv_admin=1&ce_author=TJ&ce_category=Something&ce_permalink=http%3A%2F%2Fwww.gamewheel.local%2Fstories%2Foracle&ce_title=Some+Title&ce_post_date=1458656400000
wget http://www.woopra.com/track/ce/?host=gamewheel.com&cookie=7IG7s08rtihs&ip=127.0.0.1&timeout=300000&referer=&event=UserStory&app=wordpress&cv_name=tj&cv_email=tj@gamewheel.com&cv_admin=1&ce_author=TJ&ce_category=Oracle&ce_permalink=http%3A%2F%2Fwww.gamewheel.local%2Fstories%2Foracle&ce_title=Some+Title&ce_post_date=1458656400000
cd /srv/gamewheel.local/
tj-wget http://www.woopra.com/track/ce/?host=gamewheel-analytics-test.com&cookie=7IG7s0grtihs&ip=127.0.0.1&timeout=300000&referer=&event=wp+article&app=wordpress&cv_name=tj&cv_email=tj@gamewheel.com&cv_admin=1&ce_author=TJ&ce_category=Something&ce_permalink=http%3A%2F%2Fwww.gamewheel.com%2Fstories%2Foracle&ce_title=Some+Title&ce_post_date=1458656400000
tj-wget http://www.woopra.com/track/ce/?host=gamewheel-analytics-test.com&cookie=7IG7s0grtihs&ip=127.0.0.1&timeout=300000&referer=&event=wp+custom&app=wordpress&cv_name=tj&cv_email=tj@gamewheel.com&cv_admin=1&ce_author=TJ&ce_category=Something&ce_permalink=http%3A%2F%2Fwww.gamewheel.com%2Fstories%2Foracle&ce_title=Some+Title&ce_post_date=1458656400000
tj-wget http://www.woopra.com/track/ce/?host=gamewheel.com&cookie=7IG7s08rtihs&ip=127.0.0.1&timeout=300000&referer=&event=wp+custom&app=wordpress&cv_name=tj&cv_email=tj@gamewheel.com&cv_admin=1&ce_author=TJ&ce_category=Something&ce_permalink=http%3A%2F%2Fwww.gamewheel.com%2Fstories%2Foracle&ce_title=Some+Title&ce_post_date=1458656400000
tj-wget http://www.woopra.com/track/ce/?host=gamewheel.com&cookie=7IG7s08rtihs&ip=127.0.0.1&timeout=300000&referer=&event=UserStory&app=wordpress&cv_name=tj&cv_email=tj@gamewheel.com&cv_admin=1&ce_author=TJ&ce_category=Oracle&ce_permalink=http%3A%2F%2Fwww.gamewheel.com%2Fstories%2Foracle&ce_title=Some+Title&ce_post_date=1458656400000
cd /srv/gamewheel.com/
ls
find . -name "woopra_tracker.php"
find . --name "woopra_tracker.php"
@ -3212,7 +3212,7 @@ ls -l
cd /usr/share/gamewheel/
find . -name "woopra_tracker.php"
exit
cd /srv/gamewheel.local/www
cd /srv/gamewheel.com/www
ls
cd wp-content/
ls
@ -3264,7 +3264,7 @@ sudo vim sites-enabled/www.conf
ssh gw-weg
ssh gw-web
exit
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
scp -r core gw-web:/var/www/
scp -r core gw-web:/var/www
@ -3273,7 +3273,7 @@ scp -r core gw-web:~/
cd ..
ls
cd ga,
cd gamewheel.local/
cd gamewheel.com/
ls
ssh gw-web
ls -l
@ -3282,7 +3282,7 @@ cd www
ls
exit
pm2 list
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
pm2
pm2 list
@ -3324,7 +3324,7 @@ sudo ln -s /home/tj/node-v4.4.2/bin/http-server
ls
cd
cd -
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
http-server
ls
@ -3420,7 +3420,7 @@ route
pm2 start api-runtime
cd /usr/share/gamewheel/
ls
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
cd ap
ls
@ -3531,14 +3531,14 @@ git checkout master
ls
cd ..
ls
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
ln -s /usr/share/gamewheel/logfiles.txt
ls -l
vim ~/.ssh/config
exit
cd /srv/gamewheel.local/ap
cd /srv/gamewheel.local/app
cd /srv/gamewheel.com/ap
cd /srv/gamewheel.com/app
ls
git checkout master
git pull
@ -3583,7 +3583,7 @@ git push
git diff
git commit -am "removed uncommented code"#
exit
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
l;s
ls
ls -l
@ -3592,7 +3592,7 @@ cd api
ls
make start
exit
cd /srv/gamewheel.local/api-runtime
cd /srv/gamewheel.com/api-runtime
ls
make start
exit
@ -4075,7 +4075,7 @@ rm -rf gamewheel.public
ln -s ../../../public gamewheel.public
g
ls
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
g
ls
@ -4090,7 +4090,7 @@ git checkout master
git merge unstable
git push
git checkout unstable
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
ln -s /usr/share/gamewheel/core/test/ dev-core
ls -l
@ -4307,7 +4307,7 @@ ls
cd sites-enabled
ls
cd /
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
ln -s /usr/share/gamewheel/vr_pong pong
ls -l
@ -4560,7 +4560,7 @@ exit
ssh gw-dev2
exit
exit
ping dev-pong.gamewheel.com
tj-ping dev-pong.gamewheel.com
exit
g
cd vr_pong/
@ -5830,7 +5830,7 @@ ssh gw-dev2
exit
ssh tj@cybafelo.com
exit
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
cd
g
@ -5856,7 +5856,7 @@ cd /usr/local/games/
ls
cd /usr/local/games/
sudo vim /etc/nginx/sites-enabled/games.conf
cd /srv/gamewheel.local/games/
cd /srv/gamewheel.com/games/
ls
cd instances/
ls
@ -5897,7 +5897,7 @@ grep "http.+.+.+.+.+.+.+.+.+.+.+.+.+.+.+.+gamewheel." * -R
cat /etc/nginx/sites-enabled/app.conf
cd ..
cd /srv/
cd gamewheel.local/
cd gamewheel.com/
ls
cd api
ls
@ -5965,7 +5965,7 @@ git diff
cd ..
exit
g
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
cd api-runtime
ls
@ -5989,7 +5989,7 @@ git commit -am "alpha"
git push
cd ..
ls
cd /srv/gamewheel.local/api-runtime
cd /srv/gamewheel.com/api-runtime
ls
git pull
git branch badnames
@ -6007,7 +6007,7 @@ vim
exit
gedit
exit
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
cd api-runtime
ls
node --debug-brk=3099 server.js
@ -6440,7 +6440,7 @@ sudo vim games.conf
sudo service nginx restart
sudo vim api-runtime.conf
sudo service nginx restart
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
cd ap
cd api
@ -6592,7 +6592,7 @@ node a.out.js
cat a.out.js
./emcc tests/hello_world_sdl.cpp -o hello.html
ls
cp hello.* /srv/gamewheel.local/pong/
cp hello.* /srv/gamewheel.com/pong/
cd
git clone https://github.com/kripken/ammo.js.git
cd ammo.js/
@ -7162,7 +7162,7 @@ ssh gw-dev2
cd ..
cd dark-matter/
sudo vim /etc/hosts
ping dark-matter.cybafelo.local
ping dark-matter.cybafelo.com
git diff
git branch websocket
git checkout websocket
@ -7649,13 +7649,13 @@ exit
ssh gw-beta-api
exit
ping admin.gamehweel.com
ping admin.gamewheel.com
tj-ping admin.gamewheel.com
ssh 52.58.105.135
ping gamewheel.com
ping backup.gamewheel.com
ping app.gamewheel.com
ping api.gamewheel.com
ping api-runtime.gamewheel.com
tj-ping backup.gamewheel.com
tj-ping app.gamewheel.com
tj-ping api.gamewheel.com
tj-ping api-runtime.gamewheel.com
g
cd GW_Frontend/
git diff
@ -7676,7 +7676,7 @@ git mergetool
git commit -am "merge conflicts"
git push
git push -u origin beta
ping statistics.gamewheel.com
tj-ping statistics.gamewheel.com
vim ~/.ssh/config
ssh gw-statistics
ssh gw-beta-api
@ -7692,7 +7692,7 @@ git push
exit
ssh gw-dev2
exit
ping dev-hex.gamewheel.com
tj-ping dev-hex.gamewheel.com
cd Downloads/
ls
tar -xf WebStorm-2016.2.tar.gz
@ -7860,12 +7860,12 @@ cp pong.conf racer.conf
sudo cp pong.conf racer.conf
sudo vim racer.conf
sudo vim /etc/hosts
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
sudo ln -s /usr/share/gamewheel/vr_racer/
sudo service nginx restart
ls
ping racer.gamewheel.local;
tj-ping racer.gamewheel.com;
sudo service nginx restart
sudo vim /etc/nginx/sites-enabled/racer.conf
ls
@ -7891,7 +7891,7 @@ ls
sudo cp pong.conf 3d-editor.conf
vim 3d-editor.conf
sudo vim 3d-editor.conf
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
ln -s /usr/share/gamewheel/gw_3d_editor 3d-editor
ls
@ -9474,7 +9474,7 @@ scp 3d-editor.conf gw-3d:/tmp/3d-editor.conf
scp api.conf gw-3d:/tmp/api.conf
mongo
exit
ping api16.gamewheel.com
tj-ping api16.gamewheel.com
exit
g
cd config/
@ -9501,8 +9501,8 @@ cd /var/log/
ls
cd nginx/
ls
tail -f 3d-editor.gamewheel.local.*
tail -f 3d-editor.gamewheel.local.* api.gamewheel.local.*
tj-tail -f 3d-editor.gamewheel.com.*
tj-tail -f 3d-editor.gamewheel.com.* api.gamewheel.com.*
ls
exit
tail -f /var/log/mongodb/mongodb.log
@ -9603,7 +9603,7 @@ grep "api\.url" * -R
exit
sudo vim /etc/nginx/sites-enabled/3d-editor.conf
exit
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
ls -l
cd 3d
@ -9629,9 +9629,9 @@ git push
git checkout tj-dev
exit
ssh gw-3d
telnet api16.gamewheel.com 3104
telnet api16.gamewheel.com -p 3104
telnet api16.gamewheel.com 3104
tj-telnet api16.gamewheel.com 3104
tj-telnet api16.gamewheel.com -p 3104
tj-telnet api16.gamewheel.com 3104
exit
ssh gw-3d
ssh gw-3d
@ -10708,7 +10708,7 @@ git checkout tc
git log
git cherry-pick c73d61e3250f67db06bd0e56360cf7219670eb88
git push
ssh demo.gamewheel.com
tj-ssh demo.gamewheel.com
ssh gw-demo
ssh gw-3d
cd ..
@ -11074,9 +11074,9 @@ exit
ssh gw-app
ssh gw-games
ssh gw-game
ping games.gamewheel.com
ping app.gamewheel.com
ping api.gamewheel.com
tj-ping games.gamewheel.com
tj-ping app.gamewheel.com
tj-ping api.gamewheel.com
ssh gw-api
vim /etc/nginx/sites-enabled/api-runtime.conf
g
@ -11252,7 +11252,7 @@ git commit -am "include code coverage reports"
git push
npm install --save cannon
npm install --save three
ping admin.gamewheel.com
tj-ping admin.gamewheel.com
ssh gw-admin
cd
vim .ssh/config
@ -11294,7 +11294,7 @@ vim .ssh/config
exit
ssh gw-admin
exit
ping admin.gamewheel.com
tj-ping admin.gamewheel.com
exit
g
grep "createThreeMaterial" * -R
@ -11366,8 +11366,8 @@ g
cd gamewheel-gate/
git pull
git checkout beta
ping beta-gate.gamewheel.com
telnet beta-gate.gamewheel.com 3201
tj-ping beta-gate.gamewheel.com
tj-telnet beta-gate.gamewheel.com 3201
vim /etc/nginx/nginx.conf
exit
g
@ -11747,7 +11747,7 @@ exit
sudo vim /etc/nginx/sites-enabled/3d-editor.conf
sudo service nginx restart
sudo vim /etc/nginx/sites-enabled/3d-editor.conf
openssl req -new -newkey rsa:2048 -nodes -out star_gamewheel_com.csr -keyout star_gamewheel_com.key -subj "/C=DE/ST=Berlin/L=Berlin/O=Gamewheel GmbH/CN=*.gamewheel.com"
tj-openssl req -new -newkey rsa:2048 -nodes -out star_gamewheel_com.csr -keyout star_gamewheel_com.key -subj "/C=DE/ST=Berlin/L=Berlin/O=Gamewheel GmbH/CN=*.gamewheel.com"
cat star_gamewheel_com.key
ls
cat star_gamewheel_com.csr
@ -11776,17 +11776,17 @@ echo | openssl s_client -connect gamewheel.co:443 2>/dev/null | openssl x509 -no
echo | openssl s_client -connect gamewheel.com:443 2>/dev/null | openssl x509 -noout -hash
echo | openssl s_client -connect gamewheel.com:443 2>/dev/null | openssl x509 -noout -text
echo | openssl s_client -connect gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
echo | openssl s_client -connect app.gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
tj-echo | openssl s_client -connect app.gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
echo | openssl s_client -connect gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
echo | openssl s_client -connect app.gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
echo | openssl s_client -connect app.gamewheel.com:443 2>/dev/null | openssl x509 -noout -text
tj-echo | openssl s_client -connect app.gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
tj-echo | openssl s_client -connect app.gamewheel.com:443 2>/dev/null | openssl x509 -noout -text
echo | openssl s_client -connect gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
echo | openssl s_client -connect gamewheel.com:443
openssl s_client -connect gamewheel.com:443
echo | openssl s_client -connect gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
echo | openssl s_client -connect app.gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
tj-echo | openssl s_client -connect app.gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
ssh gw-web
echo | openssl s_client -connect app.gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
tj-echo | openssl s_client -connect app.gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
echo | openssl s_client -connect gamewheel.com:443 2>/dev/null | openssl x509 -noout -dates
vim .ssh/config
cd certificate/
@ -11812,7 +11812,7 @@ ssh gw-statistics
ssh gw-rt
ssh gw-app
ssh gw-api
nslookup api-runtime.gamewheel.com
tj-nslookup api-runtime.gamewheel.com
dig runtime-api-1107062625.eu-central-1.elb.amazonaws.com.
nslookup runtime-api-1107062625.eu-central-1.elb.amazonaws.com.
nslookup runtime-api-1107062625.eu-central-1.elb.amazonaws.com
@ -11828,9 +11828,9 @@ ls
ssh gw-beta-api
ssh gw-demo
ssh gw-management
ping api-runtime.gamewheel.com
tj-ping api-runtime.gamewheel.com
ssh gw-rt
ping api-runtime.gamewheel.com
tj-ping api-runtime.gamewheel.com
vim .ssh/config
ssh gw-rt
vim .ssh/config
@ -11849,7 +11849,7 @@ ls
scp gamewheel.com.* gw-admin:/tmp/
scp gamewheel.com.* gw-app:/tmp/
ssh gw-app
ping app.gamewheel.com
tj-ping app.gamewheel.com
ssh gw-app
exit
cd certificate/
@ -11955,8 +11955,8 @@ cd ..
ls
rm wordpress
rm wordpress.tar.gz
scp gw-web:/var/www/wp.gamewheel.com.tar.gz .
tar -xf wp.gamewheel.com.tar.gz
tj-scp gw-web:/var/www/wp.gamewheel.com.tar.gz .
tj-tar -xf wp.gamewheel.com.tar.gz
ls
ssh gw-beta-api
ssh gw-beta-api
@ -11981,8 +11981,8 @@ ls
mv gamewheel.com.tar.gz /usr/share/gamewheel/
cd /usr/share/gamewheel/
ls
rm -rf wp.gamewheel.com
rm wp.gamewheel.com.tar.gz
tj-rm -rf wp.gamewheel.com
tj-rm wp.gamewheel.com.tar.gz
ls
tar -xf gamewheel.com.tar.gz
rm www.tgz
@ -12046,8 +12046,8 @@ git diff
git commit -am "revert - will create a build system based on environment"
git push
exit
ping dev-api.gamewheel.com
ssh dev-api.gamewheel.com
tj-ping dev-api.gamewheel.com
tj-ssh dev-api.gamewheel.com
g
cd gw_3d_editor/
npm install --save-dev gulp-html-prettify
@ -12099,8 +12099,8 @@ node test/integration/test.js
mv chromedriver /usr/share/bin
sudo mv chromedriver /usr/share/bin
exit
ping nagios.gamewheel.com
ping nagio.gamewheel.com
tj-ping nagios.gamewheel.com
tj-ping nagio.gamewheel.com
vim .ssh/config
ssh gw-management
exit
@ -12221,10 +12221,10 @@ cd ..
exot
exit
ping gamewheel.com
ping dev-api.gamewheel.com
tj-ping dev-api.gamewheel.com
ssh dev-api
ssh gw-dev
ping dev-api-runtime.gamewheel.com
tj-ping dev-api-runtime.gamewheel.com
g
curl -O http://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar
java -jar selenium-server-standalone-2.53.1.jar
@ -12359,7 +12359,7 @@ cd ..
grep "filePath" server.js
cd src/
grep "blenderImportComplete" * -R
ping api-admin.gamewheel.com
tj-ping api-admin.gamewheel.com
ping runtime-api-1107062625.eu-central-1.elb.amazonaws.com
ssh gw-beta
vim ~/.ssh/config
@ -12587,7 +12587,7 @@ cd ..
cd sites-enabled
sudo ln -s ../sites-available/3d-racing.conf
ls
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
ln -s /usr/share/gamewheel/3d-racing/
ls
@ -13315,7 +13315,7 @@ ls
cp 3d-editor.conf tools.conf
sudo cp 3d-editor.conf tools.conf
sudo vim tools.conf
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
ln -s /usr/share/gamewheel/tools/
ls
@ -13511,7 +13511,7 @@ ls
cd ..
cd sites-enabled/
ls
cd /srv/gamewheel.local/
cd /srv/gamewheel.com/
ls
rm *
ls
@ -13740,7 +13740,7 @@ g
cd tools/
./start
exit
scp gw-rt:/etc/nginx/sites-enabled/api-runtime.gamewheel.com.conf /usr/share/gamewheel/config/
tj-scp gw-rt:/etc/nginx/sites-enabled/api-runtime.gamewheel.com.conf /usr/share/gamewheel/config/
cd /etc/nginx/sites-enabled
ls
vim app.conf
@ -13750,7 +13750,7 @@ ls
sudo rm api.conf
sudo mv api-runtime.conf /usr/share/gamewheel/config/
ls
scp gw-rt:/etc/nginx/sites-enabled/api-runtime.gamewheel.com.conf /usr/share/gamewheel/config/
tj-scp gw-rt:/etc/nginx/sites-enabled/api-runtime.gamewheel.com.conf /usr/share/gamewheel/config/
ln -s /usr/share/gamewheel/config/api-runtime.conf
sudo ln -s /usr/share/gamewheel/config/api-runtime.conf
ls -l
@ -16692,9 +16692,9 @@ ssh gw-3d
exit
ssh gw-3d
exit
ping racer.gamewheel.com
ping 3d-editor.gamewheel.com
ping 3d-racing.gamewheel.com
tj-ping racer.gamewheel.com
tj-ping 3d-editor.gamewheel.com
tj-ping 3d-racing.gamewheel.com
exit
3d
cd src/
@ -18990,11 +18990,11 @@ git push
exit
vim .bashrc
exit
ping 3d-pong.gamewheel.com
tj-ping 3d-pong.gamewheel.com
g
cd config/
git checkout tj-dev
ping 3d-pong.gamewheel.com
tj-ping 3d-pong.gamewheel.com
cd ..
cd 3d-editor-v3
git pull
@ -19030,8 +19030,8 @@ git status
git checkout gw-3d
git merge tj-dev
ls
grep "gamewheel.local" * -R
grep "gamewheel.local" * -Rl | xargs sed -i "s/gamewheel.local/gamewheel.com/g"
grep "gamewheel.com" * -R
grep "gamewheel.com" * -Rl | xargs sed -i "s/gamewheel.com/gamewheel.com/g"
git diff
cd nginx/
ls
@ -19894,7 +19894,7 @@ git checkout cybafelo -- bashrc
git checkout cybafelo -- progress_*
git checkout cybafelo -- ubuntu*
ls
git checkout cybafelo -- vimrc.local
git checkout cybafelo -- vimrc.com
git checkout cybafelo -- .gitignore
ls
git status
@ -20281,8 +20281,8 @@ rm hosts.orig
cd nginx/
ls
vim 3doo.conf
grep "gamewheel.local" * -R
grep "gamewheel.local" * -Rl | xargs sed -i "s/gamewheel.local/gamewheel.com/g"
grep "gamewheel.com" * -R
grep "gamewheel.com" * -Rl | xargs sed -i "s/gamewheel.com/gamewheel.com/g"
git diff
git commit -am "3doo nginx setup"
git push
@ -20305,8 +20305,8 @@ r#
r
cd config/
git checkout tj-dev -- clients.js
grep "gamewheel.local" * -R
grep "gamewheel.local" * -Rl | xargs sed -i "s/gamewheel.local/gamewheel.com/g"
grep "gamewheel.com" * -R
grep "gamewheel.com" * -Rl | xargs sed -i "s/gamewheel.com/gamewheel.com/g"
git diff
git commit -am "clients into config"
git push
@ -21495,9 +21495,9 @@ git checkout tj-dev
git reset --hard HEAD
git checkout tj-dev
ls
ping https://api-admin.gamewheel.com/
ping api-admin.gamewheel.com
ping beta-api.gamewheel.com
tj-ping https://api-admin.gamewheel.com/
tj-ping api-admin.gamewheel.com
tj-ping beta-api.gamewheel.com
git diff
git commit -am "fix api nginx"
git push

View File

@ -1,12 +1,12 @@
var clients = {
'3d-pong' : {
title : "Gamewheel Multiplayer VR Pong",
ogUrl : "http://3d-pong.gamewheel.local",
tj-ogUrl : "http://3d-pong.gamewheel.com",
ogType : "website",
ogTitle : "Gamewheel Multiplayer VR Pong",
ogDescription : "Games is our game",
ogImage : "http://3d-pong.gamewheel.local/pong_image.png",
ctaUrl : "https://www.gamewheel.local",
tj-ogImage : "http://3d-pong.gamewheel.com/pong_image.png",
tj-ctaUrl : "https://www.gamewheel.com",
account : 'root',
subAccount : 'root',
nameOfTheGame : 'pong',
@ -18,18 +18,18 @@ var clients = {
'default': {
title : 'Great Job!',
message : 'Challenge your friends or learn more about Gamewheel',
cta : 'https://www.gamewheel.local',
tj-cta : 'https://www.gamewheel.com',
quote : 'VR PONG!'
}
}
},
'3doo' : {
title : "3doo - VR Pong",
ogUrl : "http://3doo.gamewheel.local",
tj-ogUrl : "http://3doo.gamewheel.com",
ogType : "website",
ogTitle : "3doo VR App",
ogDescription : "Spiele PONG in 3d und VR mit 3doo",
ogImage : "http://3doo.gamewheel.local/pong_image.png",
tj-ogImage : "http://3doo.gamewheel.com/pong_image.png",
ctaUrl : "https://3doo.com",
account : '3doo',
subAccount : 'root',

View File

@ -1,12 +1,12 @@
var config = {
vr_pong: {
url: "http://3d-pong.gamewheel.local"
url: "http://tj-3d-pong.gamewheel.com"
},
vr_racer: {
url: "http://3d-racing.gamewheel.local"
url: "http://tj-3d-racing.gamewheel.com"
},
editor: {
url: "http://3d-editor.gamewheel.local",
url: "http://tj-3d-editor.gamewheel.com",
default: {
platform: 'gamewheel',
account: 'root',
@ -16,10 +16,10 @@ var config = {
uploadPath: '/uploads'
},
api16: {
url: "http://api-v1.6.gamewheel.local"
url: "http://tj-api-v1.6.gamewheel.com"
},
tools: {
url: "http://tools.gamewheel.local",
url: "http://tj-tools.gamewheel.com",
default: {
platform: 'gamewheel',
account: 'root',
@ -27,25 +27,25 @@ var config = {
}
},
app: {
url: 'http://app.gamewheel.local'
url: 'http://tj-app.gamewheel.com'
},
api: {
url: 'http://api.gamewheel.local'
url: 'http://tj-api.gamewheel.com'
},
cdn: {
url: 'http://cdn.gamewheel.local'
url: 'http://tj-cdn.gamewheel.com'
},
gate: {
url: 'http://gate.gamewheel.local'
url: 'http://tj-gate.gamewheel.com'
},
content: {
url: 'http://content.gamewheel.local'
url: 'http://tj-content.gamewheel.com'
},
asset: {
url: 'http://asset.gamewheel.local'
url: 'http://tj-asset.gamewheel.com'
},
port: {
url: 'http://port.gamewheel.local'
url: 'http://tj-port.gamewheel.com'
},
environment: {
mode: 'development'

42
hosts
View File

@ -1,35 +1,21 @@
127.0.0.1 localhost
127.0.1.1 cybafelo
127.0.1.1 cybafelo.gamewheel.local
# Gamewheel dev endpoints
127.0.1.1 3d-editor.gamewheel.local
127.0.1.1 3d-editor-debug.gamewheel.local
127.0.1.1 3d-editor-v2.gamewheel.local
127.0.1.1 3d-editor-v2-debug.gamewheel.local
127.0.1.1 3d-editor-v3.gamewheel.local
127.0.1.1 3d-editor-v3-debug.gamewheel.local
127.0.1.1 3d-pong.gamewheel.local
127.0.1.1 3doo.gamewheel.local
127.0.1.1 3d-pong-debug.gamewheel.local
127.0.1.1 3d-racing.gamewheel.local
127.0.1.1 3d-racing-debug.gamewheel.local
127.0.1.1 api-v1.6.gamewheel.local
127.0.1.1 api-v1.6-debug.gamewheel.local
127.0.1.1 api-v2.gamewheel.local
127.0.1.1 api-v2-debug.gamewheel.local
127.0.1.1 api-v3.gamewheel.local
127.0.1.1 api-v3-debug.gamewheel.local
127.0.1.1 tools.gamewheel.local
127.0.1.1 tools-debug.gamewheel.local
127.0.1.1 gate.gamewheel.local
127.0.1.1 content.gamewheel.local
127.0.1.1 asset.gamewheel.local
127.0.1.1 port.gamewheel.local
127.0.1.1 app.gamewheel.local
127.0.1.1 api.gamewheel.local
127.0.1.1 cdn.gamewheel.local
127.0.1.1 mail.gamewheel.local
127.0.1.1 3d-editor.gamewheel.com
127.0.1.1 3d-pong.gamewheel.com
127.0.1.1 3doo.gamewheel.com
127.0.1.1 3d-racing.gamewheel.com
127.0.1.1 api-v1.6.gamewheel.com
127.0.1.1 tools.gamewheel.com
127.0.1.1 tj-gate.gamewheel.com
127.0.1.1 tj-content.gamewheel.com
127.0.1.1 tj-asset.gamewheel.com
127.0.1.1 tj-port.gamewheel.com
127.0.1.1 tj-app.gamewheel.com
127.0.1.1 tj-api.gamewheel.com
127.0.1.1 tj-cdn.gamewheel.com
127.0.1.1 mail.gamewheel.com
# The following lines are desirable for IPv6 capable hosts
::1 ip6-localhost ip6-loopback

View File

@ -3,7 +3,7 @@
server {
listen 80;
server_name api-runtime.gamewheel.local;
tj-server_name api-runtime.gamewheel.com;
#root /usr/share/gamewheel/GW_Runtime - port 3108 (old api runtime)
#root /usr/share/gamewheel/gw-statistic - port 3109 (new api runtime)

View File

@ -2,7 +2,7 @@
server {
listen 80;
server_name api.gamewheel.local;
tj-server_name api.gamewheel.com;
root /usr/share/gamewheel/api;

View File

@ -2,7 +2,7 @@
server {
listen 80;
server_name app.gamewheel.local;
tj-server_name app.gamewheel.com;
root /usr/share/gamewheel/gw-app/dist;

View File

@ -2,13 +2,13 @@ server {
listen 80;
listen 443 ssl;
server_name dev-core.gamewheel.local;
tj-server_name dev-core.gamewheel.com;
root /srv/gamewheel.local/dev-core;
root /srv/gamewheel.com/dev-core;
index index.php;
access_log /var/log/nginx/dev-core.gamewheel.local.access.log;
error_log /var/log/nginx/dev-core.gamewheel.local.error.log;
tj-access_log /var/log/nginx/dev-core.gamewheel.com.access.log;
tj-error_log /var/log/nginx/dev-core.gamewheel.com.error.log;
ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;

View File

@ -1,9 +1,9 @@
server {
listen 80;
server_name games.gamewheel.local;
tj-server_name games.gamewheel.com;
root /srv/gamewheel.local/games;
root /srv/gamewheel.com/games;
index index.html index.htm;
add_header Access-Control-Allow-Origin "$http_origin";

View File

@ -2,7 +2,7 @@
server {
listen 80;
server_name gate.gamewheel.local;
tj-server_name gate.gamewheel.com;
root /usr/share/gamewheel/gate;

View File

@ -2,11 +2,11 @@ server {
listen 80;
# listen 443 ssl;
# Replace here with proper server FQDN
server_name masker.gamewheel.local;
tj-server_name masker.gamewheel.com;
# Replace here with proper logs paths
access_log /var/log/nginx/masker.gamewheel.local.access.log;
error_log /var/log/nginx/masker.gamewheel.local.error.log;
tj-access_log /var/log/nginx/masker.gamewheel.com.access.log;
tj-error_log /var/log/nginx/masker.gamewheel.com.error.log;
# Replace here with proper certificates paths
# ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
@ -18,7 +18,7 @@ server {
#ssl_prefer_server_ciphers on;
# Replace here with proper allowed origins
# add_header Access-Control-Allow-Origin "http://app.gamewheel.local";
tj-# add_header Access-Control-Allow-Origin "http://app.gamewheel.com";
# add_header Access-Control-Allow-Credentials true;
add_header Access-Control-Allow-Methods 'HEAD, GET, POST, PUT, DELETE, OPTIONS';
add_header Access-Control-Allow-Headers 'origin, x-requested-with, content-type, accept, authorization, Access-Control-Request-Headers, Access-Control-Request-Method, x-gw-api-rt-key, x-gw-api-rt-token';

View File

@ -2,7 +2,7 @@
server {
listen 80;
server_name port.gamewheel.local;
tj-server_name port.gamewheel.com;
root /usr/share/gamewheel/port;

View File

@ -1,13 +1,13 @@
###
# https://gamewheel.local
# https://gamewheel.com
# redirect to
# https://www.gamewheeel.local
# https://www.gamewheeel.com
###
server {
listen 443 ssl;
server_name gamewheel.local;
server_name gamewheel.com;
ssl off;
ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
@ -17,12 +17,12 @@ server {
ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES";
ssl_prefer_server_ciphers on;
return 301 https://www.gamewheel.local$request_uri;
tj-return 301 https://www.gamewheel.com$request_uri;
}
###
# http://(www.)gamewheel.local
# http://(www.)gamewheel.com
# redirect to
# https://www.gamewheeel.com
###
@ -30,8 +30,8 @@ server {
server {
listen 80;
server_name gamewheel.local www.gamewheel.local;
tj-server_name gamewheel.com www.gamewheel.com;
return 301 https://www.gamewheel.local$request_uri;
tj-return 301 https://www.gamewheel.com$request_uri;
}

View File

@ -2,13 +2,13 @@ server {
listen 80;
listen 443 ssl;
server_name www.gamewheel.local;
tj-server_name www.gamewheel.com;
root /srv/gamewheel.local/www;
root /srv/gamewheel.com/www;
index index.php;
access_log /var/log/nginx/www.gamewheel.local.access.log;
error_log /var/log/nginx/www.gamewheel.local.error.log;
tj-access_log /var/log/nginx/www.gamewheel.com.access.log;
tj-error_log /var/log/nginx/www.gamewheel.com.error.log;
ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;

View File

@ -2,24 +2,11 @@
server {
listen 80;
server_name
3d-editor.gamewheel.local
3d-editor-debug.gamewheel.local;
server_name 3d-editor.gamewheel.com;
root /usr/share/gamewheel/3d-editor;
location ~/ {
if ($request_method = OPTIONS ) {
add_header Access-Control-Allow-Origin $http_origin;
add_header Access-Control-Allow-Methods "GET, OPTIONS, POST";
add_header Access-Control-Allow-Headers "Authorization";
add_header Access-Control-Allow-Credentials "true";
add_header Content-Length 0;
add_header Content-Type text/plain;
return 200;
}
location ~ {
add_header Access-Control-Allow-Origin $http_origin;
try_files $uri $uri/ @node;
}
@ -29,7 +16,7 @@ server {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-NginX-Proxy true;
proxy_pass http://127.0.0.1:3103;
proxy_pass http://3d-editor;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;

View File

@ -3,10 +3,8 @@ server {
listen 80;
server_name
3d-pong.gamewheel.local
3d-pong-debug.gamewheel.local
3doo.gamewheel.local
3doo-debug.gamewheel.local;
3d-pong.gamewheel.com
3doo.gamewheel.com;
add_header Access-Control-Allow-Origin $http_origin;

View File

@ -2,26 +2,28 @@
server {
listen 80;
server_name 3d-racing.gamewheel.local 3d-racing-debug.gamewheel.local;
server_name 3d-racing.gamewheel.com;
root /usr/share/gamewheel/3d-racing;
index index.html;
location / {
add_header Access-Control-Allow-Origin $http_origin;
autoindex on;
try_files $uri $uri/ @node;
}
#We start to pass everything to express, otherwise we end up with '/' location saying 403 Forbidden
#Static files delivered trough express.static()
location ~ {
# WebSocket support
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
location @node {
# Normal parameters
proxy_pass_request_headers on;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-NginX-Proxy true;
proxy_pass http://127.0.0.1:3102;
proxy_pass http://3d-racing;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;
}
}
}

View File

@ -2,22 +2,11 @@
server {
listen 80;
server_name api-v1.6.gamewheel.local api-v1.6-debug.gamewheel.local;
server_name api-v1.6.gamewheel.com;
root /usr/share/gamewheel/api-v1.6;
location / {
if ($request_method = OPTIONS ) {
add_header Access-Control-Allow-Origin $http_origin;
add_header Access-Control-Allow-Methods "GET, OPTIONS, POST";
add_header Access-Control-Allow-Headers "Authorization";
add_header Access-Control-Allow-Credentials "true";
add_header Content-Length 0;
add_header Content-Type text/plain;
return 200;
}
location ~ {
add_header Access-Control-Allow-Origin $http_origin;
autoindex on;
try_files $uri $uri/ @node;
@ -28,7 +17,7 @@ server {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-NginX-Proxy true;
proxy_pass http://127.0.0.1:3104;
proxy_pass http://api-v1.6;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;

View File

@ -2,7 +2,7 @@
server {
listen 80;
server_name api.gamewheel.local;
server_name tj-api.gamewheel.com;
root /usr/share/gamewheel/api;
@ -11,7 +11,7 @@ server {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-NginX-Proxy true;
proxy_pass http://127.0.0.1:3111;
proxy_pass http://api;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;

View File

@ -2,16 +2,16 @@
server {
listen 80;
server_name app.gamewheel.local;
server_name tj-app.gamewheel.com;
root /usr/share/gamewheel/app/dist;
location / {
location ~ {
proxy_pass_request_headers on;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-NginX-Proxy true;
proxy_pass http://127.0.0.1:3110;
proxy_pass http://app;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;

View File

@ -2,7 +2,7 @@
server {
listen 80;
server_name cdn.gamewheel.local;
server_name tj-cdn.gamewheel.com;
root /usr/share/gamewheel/cdn;

View File

@ -10,7 +10,7 @@ server {
include /etc/nginx/ssl.conf;
server_name ~^(?<application>.*)\.gamewheel\.local$;
server_name ~^(?<application>.*)\.gamewheel\.com$;
add_header Access-Control-Allow-Origin $http_origin;

View File

@ -2,7 +2,7 @@
server {
listen 80;
server_name mail.gamewheel.local;
tj-server_name mail.gamewheel.com;
location / {

View File

@ -3,8 +3,8 @@ server {
listen 80;
server_name
port.gamewheel.local
gamestate.gamewheel.local;
tj-port.gamewheel.com
tj-gamestate.gamewheel.com;
root /usr/share/gamewheel/port;

View File

@ -2,7 +2,7 @@
server {
listen 80;
server_name tools.gamewheel.local tools-debug.gamewheel.local;
tj-server_name tools.gamewheel.com tools-debug.gamewheel.com;
root /usr/share/gamewheel/tools;

View File

@ -1,5 +1,5 @@
ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
ssl_certificate ./certificate/gamewheel.com.crt;
ssl_certificate_key ./certificate/gamewheel.com.key;
ssl_session_timeout 5m;
ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES";