From fd6cc648ae6d9f6c291385948bc1cc964bcd72e7 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Fri, 24 Mar 2017 13:22:17 +0100 Subject: [PATCH] serve index.html --- bash_aliases | 2 +- bash_history | 810 +++++++++++++++++++++++++++ nginx/sites-available/gamewheel.conf | 4 + secure.js | 2 +- 4 files changed, 816 insertions(+), 2 deletions(-) diff --git a/bash_aliases b/bash_aliases index f07c9f3..61de5cf 100644 --- a/bash_aliases +++ b/bash_aliases @@ -15,6 +15,6 @@ alias gate='cd /usr/share/gamewheel && ./start_gate' alias e1='cd /usr/share/gamewheel && ./start_editor_v1' alias e2='cd /usr/share/gamewheel && ./start_editor_v2' alias e3='cd /usr/share/gamewheel && ./start_editor_v3' -alias l='cd /usr/share/gamewheel && ./logs' +alias logs='cd /usr/share/gamewheel && ./logs' alias m='pm2 monit' alias list='pm2 list' diff --git a/bash_history b/bash_history index 0bb5c34..357b265 100644 --- a/bash_history +++ b/bash_history @@ -22178,3 +22178,813 @@ m r m exit +cd config/ +ls +cp inputrc /usr/share/gamewheel/config/ +c +cd config/ +ls +vim inputrc +git status +git add inputrc +git commit -am "inputrc" +git push +cd .. +c +cd +ls +rm \.inputrc +ln -s /usr/share/gamewheel/config/inputrc \.inputrc +ls +exit +start +s +cd ~/node-v4.4.2/lib/node_modules/capto/app/config/ +ls +vim settings.js +ssh gw-beta +mong +mongo +ssh gw-beta +exit +ifconfig +exit +ping gw-beta.gamewheel.com +ping beta-app.gamewheel.com +ping beta-api.gamewheel.com +exit +mongo +ssh gw-beta +c +cd app +cd test/ +mkdir specs +ls +cd specs/ +ls +cd .. +node test.js +cd test +ls +cd specs/ +ls +vim test_app.js +ls +cd .. +cd 3d-editor +ls +cd test/ +ls +cd integration/ +ls +vim test-3d-editor.js +# +ls +cd .. +ls +cd app +ls +npm install --save-dev assert +npm install --save-dev rmdir +node test.js +exit +cd /usr/local/bin/ +ls +sudo mv chromedriver chromedriver.bak +cp ~/Downloads/chromedriver_linux64\ \(1\).zip . +sudo cp ~/Downloads/chromedriver_linux64\ \(1\).zip . +sudo unzip chromedriver_linux64\ \(1\).zip +ls -l +sudo rm chromedriver_linux64\ \(1\).zip +ls +chromedriver +npm install -g v8debug +v8debug +npm remove -g v8debug +sudo npm install -g v8debug +v8debug +cd /usr/local/bin/ +ls +which v8debug +node -v +c +cd app/ +npm update +rm -rf node_modules +npm install +cd .. +cd port/ +ls +cd bin +git diff +ls +vim start +cd .. +cd api +ls +rm -rf node_modules/ +npm install +cd .. +cd gate +rm -rf node_modules/ +npm install +cd .. +cd port/ +rm -rf node_modules/ +npm install +cd .. +cd cdn/ +ls +cd .. +ls +cd config/ +rm -rf node_modules +npm install +cd .. +cd connect/ +ls +rm -rf node_modules +npm install +cd .. +cd controller/ +ls +rm -rf node_modules +npm install +cd .. +ls +cd helper/ +rm -rf node_modules +npm install +cd .. +cd model +rm -rf node_modules +npm install +cd .. +cd port/ +ls +rm -rf node_modules +npm install +r +sudo npm remove -f pm2 +sudo npm install pm2 +r +sudo npm remove pm2 +sudo npm install -g pm2 +pm2 +pm2 --version +r +d +pm2 update +d +s +cd /etc/nginx/ +ls +cd conf.d +l +cd /etc/nginx/conf.d +ls +vim ports.conf +xc +c +cd app +l +m +l +cd +ls +ls -l | grep node +cd .npm +ls +cd .. +mv \.npm \.npm.bak +cd +c +./start_api +npm install +npm +which npm +cd .. +cd /usr/bin +ls | grep npm +cd ../lib +ls +ls | grep node +cd no +cd node_modules/ +l +cd - +ls +cd npm +ls +cd bin/ +ls +npm +cd .. +cd local/bin/ +ls +which npm +npm +cd +rm -f node-v4.4.2.bak +rm -rf node-v4.4.2.bak +sudo rm -rf node-v4.4.2.bak +sudo rm \.npm +sudo rm -rf \.npm +sudo apt-get remove nodejs +sudo npm +sudo apt-get remove npm +sudo apt-get autoremove +node +sudo apt-get remove node +grep "node" * -R +ls +cd /usr/local/bin +l +ls +cd +vim bash_a +c +cd config/ +vim bash_aliases +:q +exit +sudo npm remove -g capto +sudo npm install -g capto +capto run +cd node-v4.4.2/lib/node_modules/capto/app/config/ +ls +mv settings.js.example settings.js +sudo mv settings.js.example settings.js +r +cd +ls +c +cd config/ +ls +vim start_mail +sudo npm remove -g capto +captoinfo +sudo npm install -g capto +capto run +npm --help +npm config +npm config lsit +npm config list +npm config ls -l +ls -l +cd +ls +which node +node -v +ls -l +cd node-v4.4.2/ +ls +tree . +cd .. +mv node-v4.4.2 node-v4.4.2.bak +capto run +npm +node --help +ls +ls grep "node" +ls | grep "node" +grep "node-v4.4.2" * -R +cd /etc/ +grep "node-v4.4.2" * -R +node +npm +echo $(NPM_HOME) +npmrc +ls +cd +vim .npmrc +cd /usr/local/ +ls +cd lib/ +ls +cd .. +ls +cd .. +cd lib +ls +find . -name "node_modules" +cd .. +find . -name "node_modules" +cd local/ +find . -name "node_modules" +ls -l +cd bin/ +ls +sudo apt-get install npm +ls +npm +ls +cd .. +ls +cd lib/ +ls +rm node_modules +sudo rm node_modules +sudo apt-get install --update npm +sudo apt-get install --upgrade npm +npm +cd .. +cd bin +ls +rm bower +sudo rm bower +sudo rm browserify +sudo rm capto +sudo rm cloc +sudo rm grunt +sudo rm gulp +sudo rm hs +sudo rm http-server +sudo rm n +sudo rm node* +;s +ls +rm npm +sudo rm npm +sudo rm pm2 +sudo rm pm2-* +sudo rm rundev +sudo rm selenium-standalone +sudo rm start-selenium +sudo rm tsc +sudo rm tsserver +sudo rm typings +sudo rm weinre +ls +ln -s +sudo apt-get remove npm +node +sudo apt-get install nodejs +sudo apt-get autoremove +sudo apt-get install npm +npm +node +pm2 +sudo apt-get update +sudo apt-get install pm2 +npm install pm2 +sudo npm install -g pm2 +cd Dow +cd +cd Downloads/ +ls +tar -xf node-v6.10.1-linux-x64.tar.xz +cd node-v6.10.1-linux-x64/ +ls +vim README.md +ls +cd bin/ +ls +no +./node +cd .. +ls +curl -sL https://deb.nodesource.com/setup_7.x | sudo -E bash - +sudo apt-get install nodejs +npm +npm -v +node -v +npm install -g pm2 +sudo npm install -g pm2 +ls -l +r +ls -l +d +s +r +cd config/ +ls +vim start_mail +cd .. +npm install -g capto +sud onpm install -g capto +sudo npm install -g capto +capto run +cd /usr/local/lib/node_modules/capto/app/config/ +ls +sudo mv settings.js.example settings.js +capto run +cd .. +ls +cd .. +ls +npm install +sudo npm install +capto run +cd .. +ls +sudo npm install -g coffee-script +capto run +r +ls -l +cd app/ +rm -rf node_modules +npm install +cd .. +cd api +rm -rf node_modules/ +npm install +cd .. +ls +cd cdn/ +ls +cd .. +cd config/ +rm -rf node_modules +npm install +cd .. +cd connect/ +rm -rf node_modules +npm install +cd .. +cd controller/ +rm -rf node_modules +npm install +cd .. +cd gamewheel +ls +npm install +cd .. +ls +cd gate/ +rm -rf node_modules +npm install +cd .. +cd helper +rm -rf node_modules +npm install +cd .. +cd model +rm -rf node_modules +npm install +cd .. +cd port +rm -rf node_modules/ +npm install +r +ls -l +./start_app +ls +vim start_api +grep "debug=" * -R +grep "debug=" * +grep "debug=" * -l | xargs sed -i "s/debug=/inspect=/" +grep "debug=" * -l | xargs sed -i "s/debug\=/inspect\=/" +grep "debug=" * -l | xargs sed -i "s/debug\\=/inspect\\=/" +ls +vim start_ap +vim start_api +ls +m +./start_ap +./start_api +cd +ls +cd .npm +l +cd +cd .npm +ls +cd .. +node -v +which node +cd /usr/bin/ +ls | grep node +cd .. +cd lib +ls | grep node +cd node_modules/ +ls +cd npm/ +ls +cd .. +ls +which node +cd /usr/bin/ +ls +cd .. +cd local/ +cd lib/ +ls +cd node_modules/ +ls +l +exit +node +npm +ls -l +ls | grep npm +rm .npmrc +rm .npm.bak/ +rm .npm.bak +rm -rf .npm.bak +ls | grep npm +ls | grep node +rm -rf \.node-gyp +sudo rm -rf .node-gyp +sudo rm -rf .node_repl_history +ls +ls -l | grep pm2 +rm -rf \.pm2 +ls -l +ls | grep pm2 +ls | grep node +ls | grep npm +ls -l +sudo apt-get install nodejs +node -v +sudo apt-get install npm +sudo apt-get install --fix-missing +sudo apt-get remove nodejs +sudo apt-get remove node +curl -sL https://deb.nodesource.com/setup_7.x | sudo -E bash - +sudo apt-get install nodejs +sudo apt-get install -y build-essential +sudo apt-get install npm +sudo apt-get update +curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - +curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - +sudo apt-get install nodejs +sudo apt-get remove nodejs +sudo apt-get install nodejs +node -v +sudo apt-get install npm +sudo vim /etc/apt/sources.list +ls +cd /etc/ap +cd /etc/apt +ls +cd sources.list.d/ +ls +vim nodesource.list +npm -v +sudo npm install npm -g +ls -l +cd +c +cd api +rm -rf node_modules +npm install +ls +cd .. +./start_api +r +cd .. +cd gamewheel/ +cd app/ +ls +cd .. +cd app/ +rm -rf node_modules +npm install +cd .. +./start_app +ls +cd config/ +rm -rf node_modules +npm install +cd .. +cd connect +rm -rf node_modules/ +npm install +cd .. +cd controller/ +rm -rf node_modules +npm install +cd .. +cd gamewheel +rm -rf node_modules/ +npm install +cd .. +cd gate/ +rm -rf node_modules/ +npm install +cdcd .. +cd .. +cd helper/ +rm -rf node_modules/ +npm install +cd .. +cd model +rm -rf node_modules/ +np +npm install +cd .. +cd port/ +rm -rf node_modules/ +npm install +npm install -g capto +sudo npm install -g capto +capto run +sudo npm install -g coffee-script +capto run +exit +gedit +r +ls +cd app +ls +./node_modules/.bin/wdio config +wdio wdio.conf.js +./node_modules/.bin/wdio wdio.conf.js +git status +cd test/reports/ +ls +git status +cd .. +git commit -am "integration tests for app" +git push +git checkout develop +git merge feature/integration_tests +git push +git pull +git push +cd .. +cd api +git diff +git checkout develop +git diff +git branch feature/password_mails +git checkout feature/password_mails +git push -u origin feature/password_mails +git commit -am "routes" +git push +git checkout develop +git pull +git checkout feature/password_mails +cd .. +cd controller/ +git pull +exit +c +cd app +ls +git diff +git pull +git branch feature/forgot_link +git checkout feature/forgot_link +cd .. +cd api +git pull +git branch feature/forgot_link +git checkout feature/forgot_link +git push -u origin feature/forgot_link +cd .. +cd app +git push -u origin feature/forgot_link +git branch -a +git checkout develop +git branch feature/integration_tests +git checkout feature/integration_tests +git diff +git push -u origin feature/integration_tests +cd .. +ls +cd 3d-editor +ls +cd test/ +ls +cd .. +ls +cd app +ls +mkdir test +ls +nom install --save wdio +npm install --save wdio +./node_modules/.bin/wdio --help +ls +cd node_modules/ +ls +cd wdio/ +ls +ls -l +node wdio.js +node wdio.js --help +vim example.js +cd .. +npm remove --save wdio +npm install --save-dev webdriverio +./node_modules/.bin/wdio --help +sudo npm install -g vvo/selenium-standalone +selenium-standalone +selenium-standalone start +selenium-standalone install +sudo selenium-standalone install +sudo selenium-standalone start +selenium-standalone start +sudo npm install -g vvo/selenium-standalone +selenium-standalone start +exit +selenium-standalone start +cd /usr/lib/node_modules/selenium-standalone/ +ls +ls -l +selenium-standalone install +sudo selenium-standalone install +selenium-standalone start +exit +selenium-standalone start +cd /usr/local/bin/ +ls +./chromedriver +exit +m +exit +sudo npm cache clean -f +sudo npm install -g n +sudo n stable +node -v +exit +sudo npm install -g v8-debug +v8debug +v8-debug +exit +s +r +which capto +cd /usr/local/bin/ +ls +cd capto +cd ../lib/node_modules/capto/ +ls +vim package.json +npm install --save coffee-script +sudo npm install --save coffee-script +capto run +npm remove --save coffee-script +sudo npm remove --save coffee-script +capto run +ls -l +cd .. +ls +cd coffee-script/ +ls +cd bin/ +ls +./coffee +ls +cd .. +ls +cd .. +ls +npm remove -g coffee-script +sudo npm remove -g coffee-script +sudo npm install -g coffee-script@1.6.3 +capto run +sudo npm remove -f coffee-script +sudo npm remove -f coffee-script@1.6.3 +ls -l +cd capto/ +sudo npm install --save coffee-script@1.6.3 +sudo npm install --save connect +capto run +r +cd app +git pull +r +ls +vim start_api +r +d +s +r +cd controller/ +ls +git diff +git commit -am "reset link things" +git pull +git mergetool +r +0~ +./update_all +r +exit +selenium-standalone start +exit +logs +exit +c +cd api +touch t +git status +rm t +vim +ls +vim reports.sql +git diff +exit +c +./update_all +cd gate/ +git pull +cd .. +cd model/ +git pull +r +exit diff --git a/nginx/sites-available/gamewheel.conf b/nginx/sites-available/gamewheel.conf index 51c6260..509bb87 100644 --- a/nginx/sites-available/gamewheel.conf +++ b/nginx/sites-available/gamewheel.conf @@ -23,6 +23,10 @@ server { include fastcgi_params; } + location = / { + try_files /index.html @node; + } + location ~ { add_header Access-Control-Allow-Origin $http_origin; try_files $uri dist/$uri @node; diff --git a/secure.js b/secure.js index 5f4a927..f38232c 100644 --- a/secure.js +++ b/secure.js @@ -75,7 +75,7 @@ var secure = { liveReloadPort: 3411, mongodb: { host: 'mongodb://127.0.0.1', - db: 'apidev', + db: 'tjDB', port: 27017, shardPort: 27018, options: {