diff --git a/bash_aliases b/bash_aliases index e7d0df0..cb8cd72 100644 --- a/bash_aliases +++ b/bash_aliases @@ -1,21 +1,21 @@ -alias c='cd /usr/share/gamewheel' -alias s='cd /usr/share/gamewheel && ./start' -alias d='cd /usr/share/gamewheel && ./delete' -alias st='cd /usr/share/gamewheel && ./stop' -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 ps='cd /usr/share/gamewheel && ./start_pong' -alias api='cd /usr/share/gamewheel && ./start_api' -alias app='cd /usr/share/gamewheel && ./start_app' -alias port='cd /usr/share/gamewheel && ./start_port' -alias gate='cd /usr/share/gamewheel && ./start_gate' -alias e1='cd /usr/share/gamewheel && ./start_editor' -alias logs='cd /usr/share/gamewheel && ./logs' +alias c='cd /usr/share/cybafelo' +alias s='cd /usr/share/cybafelo && ./start' +alias d='cd /usr/share/cybafelo && ./delete' +alias st='cd /usr/share/cybafelo && ./stop' +alias g='cd /usr/share/cybafelo' +alias p='cd /usr/share/cybafelo/3d-pong' +alias 3d='cd /usr/share/cybafelo/3d-editor' +alias gl='cd /usr/share/cybafelo/game-lib' +alias ps='cd /usr/share/cybafelo && ./start_pong' +alias api='cd /usr/share/cybafelo && ./start_api' +alias app='cd /usr/share/cybafelo && ./start_app' +alias port='cd /usr/share/cybafelo && ./start_port' +alias gate='cd /usr/share/cybafelo && ./start_gate' +alias e1='cd /usr/share/cybafelo && ./start_editor' +alias logs='cd /usr/share/cybafelo && ./logs' alias m='pm2 monit' alias list='pm2 list' function r() { - /usr/share/gamewheel/restart "$@" + /usr/share/cybafelo/restart "$@" } export -f r diff --git a/bash_history b/bash_history index 421869f..19a663b 100644 --- a/bash_history +++ b/bash_history @@ -23960,3 +23960,11 @@ git commit -am "loading jobs - catching bad cron configs" git push m exit +ls -l +sudo rm .bash_history +rm .bash_history +ln -s /usr/share/cybafelo/config/bash_history .bash_history +ln -s /usr/share/cybafelo/config/inputrc \.inputrc +ln -s /usr/share/cybafelo/config/bash_aliases \.bash_aliases +ls +exit diff --git a/build_latest b/build_latest index b827028..0cb7215 100755 --- a/build_latest +++ b/build_latest @@ -1,7 +1,7 @@ #!/bin/bash #for package in $() -for dir in /usr/share/gamewheel/*/ +for dir in /usr/share/cybafelo/*/ do dir_short_name=${dir%*/} dir_short_name=${dir_short_name##*/} diff --git a/clients.js b/clients.js index c682b07..2fe7640 100644 --- a/clients.js +++ b/clients.js @@ -1,12 +1,12 @@ var clients = { '3d-pong' : { title : "Gamewheel Multiplayer VR Pong", - ogUrl : "http://3d-pong.gamewheel.com", + ogUrl : "http://3d-pong.cybafelo.com", ogType : "website", ogTitle : "Gamewheel Multiplayer VR Pong", ogDescription : "Games is our game", - ogImage : "http://3d-pong.gamewheel.com/pong_image.png", - ctaUrl : "https://www.gamewheel.com", + ogImage : "http://3d-pong.cybafelo.com/pong_image.png", + ctaUrl : "https://www.cybafelo.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.com', + cta : 'https://www.cybafelo.com', quote : 'VR PONG!' } } }, '3doo' : { title : "3doo - VR Pong", - ogUrl : "http://3doo.gamewheel.com", + ogUrl : "http://3doo.cybafelo.com", ogType : "website", ogTitle : "3doo – VR App", ogDescription : "Spiele PONG in 3d und VR mit 3doo", - ogImage : "http://3doo.gamewheel.com/pong_image.png", + ogImage : "http://3doo.cybafelo.com/pong_image.png", ctaUrl : "https://3doo.com", account : '3doo', subAccount : 'root', diff --git a/config.js b/config.js index 3726d24..91caa26 100644 --- a/config.js +++ b/config.js @@ -1,14 +1,14 @@ var config = { vr_pong: { - url: "https://tj-3d-pong.gamewheel.com" + url: "https://tj-3d-pong.cybafelo.com" }, vr_racer: { - url: "https://tj-3d-racing.gamewheel.com" + url: "https://tj-3d-racing.cybafelo.com" }, editor: { - url: "https://tj-3d-editor.gamewheel.com", + url: "https://tj-3d-editor.cybafelo.com", default: { - platform: 'gamewheel', + platform: 'cybafelo', account: 'root', subAccount: 'root', nameOfTheGame: 'test' @@ -16,39 +16,39 @@ var config = { uploadPath: '/uploads' }, api16: { - url: "https://tj-api-v1.gamewheel.com" + url: "https://tj-api-v1.cybafelo.com" }, tools: { - url: "https://tj-tools.gamewheel.com", + url: "https://tj-tools.cybafelo.com", default: { - platform: 'gamewheel', + platform: 'cybafelo', account: 'root', subAccount: 'root' } }, app: { - url: 'https://tj-app.gamewheel.com' + url: 'https://tj-app.cybafelo.com' }, api: { - url: 'https://tj-api.gamewheel.com' + url: 'https://tj-api.cybafelo.com' }, cdn: { - url: 'https://tj-cdn.gamewheel.com' + url: 'https://tj-cdn.cybafelo.com' }, gate: { - url: 'https://tj-gate.gamewheel.com' + url: 'https://tj-gate.cybafelo.com' }, content: { - url: 'https://tj-content.gamewheel.com' + url: 'https://tj-content.cybafelo.com' }, asset: { - url: 'https://tj-asset.gamewheel.com' + url: 'https://tj-asset.cybafelo.com' }, port: { - url: 'https://tj-port.gamewheel.com' + url: 'https://tj-port.cybafelo.com' }, cron: { - url: 'https://tj-cron.gamewheel.com' + url: 'https://tj-cron.cybafelo.com' }, environment: { mode: 'development' diff --git a/general.encrypted b/general.encrypted new file mode 100644 index 0000000..82ee510 Binary files /dev/null and b/general.encrypted differ diff --git a/hosts b/hosts index 3129451..369e929 100644 --- a/hosts +++ b/hosts @@ -1,23 +1,23 @@ 127.0.0.1 localhost 127.0.1.1 cybafelo -127.0.1.1 cybafelo.gamewheel.com +127.0.1.1 cybafelo.cybafelo.com # Gamewheel dev endpoints -127.0.1.1 tj-3d-editor.gamewheel.com -127.0.1.1 tj-3d-pong.gamewheel.com -127.0.1.1 tj-3doo.gamewheel.com -127.0.1.1 tj-3d-racing.gamewheel.com -127.0.1.1 tj-api-v1.gamewheel.com -127.0.1.1 tj-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 tj-mail.gamewheel.com -127.0.1.1 tj-cron.gamewheel.com +127.0.1.1 tj-3d-editor.cybafelo.com +127.0.1.1 tj-3d-pong.cybafelo.com +127.0.1.1 tj-3doo.cybafelo.com +127.0.1.1 tj-3d-racing.cybafelo.com +127.0.1.1 tj-api-v1.cybafelo.com +127.0.1.1 tj-tools.cybafelo.com +127.0.1.1 tj-gate.cybafelo.com +127.0.1.1 tj-content.cybafelo.com +127.0.1.1 tj-asset.cybafelo.com +127.0.1.1 tj-port.cybafelo.com +127.0.1.1 tj-app.cybafelo.com +127.0.1.1 tj-api.cybafelo.com +127.0.1.1 tj-cdn.cybafelo.com +127.0.1.1 tj-mail.cybafelo.com +127.0.1.1 tj-cron.cybafelo.com # The following lines are desirable for IPv6 capable hosts ::1 ip6-localhost ip6-loopback diff --git a/nginx/sites-available/gamewheel.conf b/nginx/sites-available/gamewheel.conf index f46e990..fb72d74 100644 --- a/nginx/sites-available/gamewheel.conf +++ b/nginx/sites-available/gamewheel.conf @@ -12,7 +12,7 @@ server { server_name ~^(?.*?)-(?.*?)\.(?.*); - root /usr/share/gamewheel/$app; + root /usr/share/cybafelo/$app; location ~ \.php$ { @@ -21,7 +21,7 @@ server { add_header Content-Type text/plain; add_header Access-Control-Allow-Origin $http_origin; add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; - add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-gamewheel"; + add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-cybafelo"; add_header Access-Control-Allow-Credentials true; return 200; } @@ -41,7 +41,7 @@ server { add_header Content-Type text/plain; add_header Access-Control-Allow-Origin $http_origin; add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; - add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-gamewheel"; + add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-cybafelo"; add_header Access-Control-Allow-Credentials true; return 200; } @@ -58,7 +58,7 @@ server { add_header Content-Type text/plain; add_header Access-Control-Allow-Origin $http_origin; add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; - add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-gamewheel"; + add_header Access-Control-Allow-Headers "Authorization, Content-Type, x-cybafelo"; add_header Access-Control-Allow-Credentials true; return 200; } diff --git a/nginx/ssl/ssl.conf b/nginx/ssl/ssl.conf index 4906a39..d4f0b67 100644 --- a/nginx/ssl/ssl.conf +++ b/nginx/ssl/ssl.conf @@ -1,5 +1,5 @@ - ssl_certificate ssl/gamewheel.com.crt; - ssl_certificate_key ssl/gamewheel.com.key; + ssl_certificate ssl/cybafelo.com.crt; + ssl_certificate_key ssl/cybafelo.com.key; ssl_session_timeout 5m; ## Don't use SSL v3 because of POODLE vulnerability # ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; diff --git a/package.json b/package.json index 3b7fb62..87cd8ca 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "gamewheel-config", + "name": "cybafelo-config", "version": "0.0.1", "author": "Theunis J. Botha", "description": "Tools for Gamewheel", diff --git a/secure.js b/secure.js index d38731d..2e54387 100644 --- a/secure.js +++ b/secure.js @@ -26,7 +26,7 @@ var secure = { }, mongodb: { host: 'mongodb://127.0.0.1', - db: 'gamewheel', + db: 'cybafelo', port: 27017, shardPort: 27018, options: { @@ -96,7 +96,7 @@ var secure = { // host: "smtp.office365.com", // port: 587, // auth: { - // user: "admin@gamewheel.com", + // user: "admin@cybafelo.com", // pass: "Toypro42!" // }, // secureConnection: false, @@ -105,8 +105,8 @@ var secure = { // rejectUnauthorized: false // }, // emails: { - // founder: "evgeni@gamewheel.com", - // support: "support@gamewheel.com" + // founder: "evgeni@cybafelo.com", + // support: "support@cybafelo.com" // } // }, mailer: { @@ -129,7 +129,7 @@ var secure = { cron: { port: 3116, debugPort: 3216, - apiUser : 'tj@gamewheel.com', + apiUser : 'tj@cybafelo.com', apiPassword : 'test12345' } }; diff --git a/start b/start index af6bc6b..17decb6 100755 --- a/start +++ b/start @@ -1,5 +1,5 @@ #!/bin/bash -cd /usr/share/gamewheel +cd /usr/share/cybafelo ./start_editor ./start_api ./start_app diff --git a/start_api b/start_api index c16dbe1..dad4fe1 100755 --- a/start_api +++ b/start_api @@ -1,3 +1,3 @@ #!/bin/bash -cd /usr/share/gamewheel/api +cd /usr/share/cybafelo/api pm2 start bin/start --node-args="--debug=3211" --name api \ No newline at end of file diff --git a/start_app b/start_app index 054814b..2422e89 100755 --- a/start_app +++ b/start_app @@ -1,3 +1,3 @@ #!/bin/bash -cd /usr/share/gamewheel/app +cd /usr/share/cybafelo/app pm2 start bin/start --node-args="--debug=3210" --name app \ No newline at end of file diff --git a/start_cron b/start_cron index 21637bd..b5ec227 100755 --- a/start_cron +++ b/start_cron @@ -1,3 +1,3 @@ #!/bin/bash -cd /usr/share/gamewheel/cron +cd /usr/share/cybafelo/cron pm2 start bin/start --node-args="--debug-brk=3216" --name cron \ No newline at end of file diff --git a/start_editor b/start_editor index 769a5ab..67f268b 100755 --- a/start_editor +++ b/start_editor @@ -1,5 +1,5 @@ #!/bin/bash -cd /usr/share/gamewheel/api-v1 +cd /usr/share/cybafelo/api-v1 pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1 -cd /usr/share/gamewheel/3d-editor +cd /usr/share/cybafelo/3d-editor pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3203" --name 3d-editor \ No newline at end of file diff --git a/start_gate b/start_gate index e68cc46..aa031b4 100755 --- a/start_gate +++ b/start_gate @@ -1,3 +1,3 @@ #!/bin/bash -cd /usr/share/gamewheel/gate +cd /usr/share/cybafelo/gate pm2 start bin/start --node-args="--debug=3215" --name gate \ No newline at end of file diff --git a/start_mail b/start_mail index b20379d..e0557e5 100755 --- a/start_mail +++ b/start_mail @@ -1,3 +1,3 @@ #!/bin/bash -cd /usr/share/gamewheel/gate +cd /usr/share/cybafelo/gate pm2 start capto -- run diff --git a/start_pong b/start_pong index acde08b..8046c40 100755 --- a/start_pong +++ b/start_pong @@ -1,5 +1,5 @@ #!/bin/bash -cd /usr/share/gamewheel/api-v1 +cd /usr/share/cybafelo/api-v1 pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1 -cd /usr/share/gamewheel/3d-pong +cd /usr/share/cybafelo/3d-pong pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3201" --name 3d-pong \ No newline at end of file diff --git a/start_port b/start_port index 97518da..2419dde 100755 --- a/start_port +++ b/start_port @@ -1,3 +1,3 @@ #!/bin/bash -cd /usr/share/gamewheel/port +cd /usr/share/cybafelo/port pm2 start bin/start --node-args="--debug=3214" --name port \ No newline at end of file diff --git a/start_racing b/start_racing index d83cedc..482bf9c 100755 --- a/start_racing +++ b/start_racing @@ -1,3 +1,3 @@ #!/usr/bin/env bash -#cd /usr/share/gamewheel/3d-racing-server +#cd /usr/share/cybafelo/3d-racing-server #pm2 start app.js --node-args="--max-old-space-size=16000 --debug=3202" --name 3d-racing-server \ No newline at end of file diff --git a/start_tools b/start_tools index 74c9d8a..09c4301 100755 --- a/start_tools +++ b/start_tools @@ -1,3 +1,3 @@ #!/usr/bin/env bash -cd /usr/share/gamewheel/tools +cd /usr/share/cybafelo/tools pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3209" --name tools \ No newline at end of file