From e45259db64f323fe88b08cf54a2edc1d27fe04df Mon Sep 17 00:00:00 2001 From: cybafelo Date: Mon, 26 Sep 2016 14:19:13 +0000 Subject: [PATCH 01/32] gw-3d conf --- config.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config.js b/config.js index 89e8f28..bcd28b9 100644 --- a/config.js +++ b/config.js @@ -1,22 +1,22 @@ var config = { vr_pong : { - url: "http://pong.gamewheel.local", + url: "http://pong", port: 3101, debugPort: 3201 }, vr_racer : { - url: "http://racer.gamewheel.local", + url: "http://racer", port: 3102, debugPort: 3202 }, editor : { - url: "http://3d-editor.gamewheel.local", + url: "http://3d-editor.gamewheel.com", port: 3103, debugPort: 3203, cluster: false }, api16 : { - url: "http://api.gamewheel.local", + url: "http://api16.gamewheel.com", port: 3104, debugPort: 3204 } From c3befc06348acddf42afcd9428162a93b8437397 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Tue, 27 Sep 2016 09:05:32 +0000 Subject: [PATCH 02/32] gw-3d config extended --- config.js | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/config.js b/config.js index bcd28b9..12f696c 100644 --- a/config.js +++ b/config.js @@ -1,11 +1,11 @@ var config = { vr_pong : { - url: "http://pong", + url: "http://demo.gamewheel.com/vr_pong", port: 3101, debugPort: 3201 }, vr_racer : { - url: "http://racer", + url: "http://demo.gamewheel.com/vr_racer", port: 3102, debugPort: 3202 }, @@ -19,7 +19,35 @@ var config = { url: "http://api16.gamewheel.com", port: 3104, debugPort: 3204 - } + mailer : { + host: 'localhost', + port: 9025, + secure: false, + debug: true, + ignoreTLS: true + }, + mongodb : { + host : 'mongodb://127.0.0.1', + db : 'gamewheel', + options : { + db: { + native_parser: true + }, + server: { + poolSize: 5, + keepAlive: 120 + }, + //replset: { rs_name: 'myReplicaSetName' }, + user: '', + pass: '', + autoIndex: false + } + }, + server : { + cluster : false + }, + sessionKey : 'iJswK29klj20Jos02mJK8ud9239j23' + } }; if (typeof module !== 'undefined') { From a484e181e89222bc877be7b48a6889bb5d0cdcf4 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 27 Sep 2016 11:07:30 +0200 Subject: [PATCH 03/32] config fixes --- config.js | 69 +++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/config.js b/config.js index 12f696c..1086458 100644 --- a/config.js +++ b/config.js @@ -1,56 +1,55 @@ var config = { - vr_pong : { + vr_pong: { url: "http://demo.gamewheel.com/vr_pong", port: 3101, debugPort: 3201 }, - vr_racer : { + vr_racer: { url: "http://demo.gamewheel.com/vr_racer", port: 3102, debugPort: 3202 }, - editor : { + editor: { url: "http://3d-editor.gamewheel.com", port: 3103, debugPort: 3203, cluster: false }, - api16 : { + api16: { url: "http://api16.gamewheel.com", port: 3104, - debugPort: 3204 - mailer : { - host: 'localhost', - port: 9025, - secure: false, - debug: true, - ignoreTLS: true - }, - mongodb : { - host : 'mongodb://127.0.0.1', - db : 'gamewheel', - options : { - db: { - native_parser: true - }, - server: { - poolSize: 5, - keepAlive: 120 - }, - //replset: { rs_name: 'myReplicaSetName' }, - user: '', - pass: '', - autoIndex: false - } - }, - server : { - cluster : false - }, - sessionKey : 'iJswK29klj20Jos02mJK8ud9239j23' - } + debugPort: 3204, + mailer: { + host: 'localhost', + port: 9025, + secure: false, + debug: true, + ignoreTLS: true + }, + mongodb: { + host: 'mongodb://127.0.0.1', + db: 'gamewheel', + options: { + db: { + native_parser: true + }, + server: { + poolSize: 5, + keepAlive: 120 + }, + user: '', + pass: '', + autoIndex: false + } + }, + server: { + cluster: false + }, + sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' + } }; if (typeof module !== 'undefined') { - module.exports = config; + module.exports = config; } From 81d9bba4aa4d9de66c7356644bfa39ba4b2fd200 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 27 Sep 2016 11:12:32 +0200 Subject: [PATCH 04/32] include mongo ports --- config.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config.js b/config.js index 1086458..04245fb 100644 --- a/config.js +++ b/config.js @@ -1,11 +1,11 @@ var config = { vr_pong: { - url: "http://demo.gamewheel.com/vr_pong", + url: "http://pong", port: 3101, debugPort: 3201 }, vr_racer: { - url: "http://demo.gamewheel.com/vr_racer", + url: "http://racer", port: 3102, debugPort: 3202 }, @@ -29,6 +29,8 @@ var config = { mongodb: { host: 'mongodb://127.0.0.1', db: 'gamewheel', + port: 27017, + shardPort: 27018, options: { db: { native_parser: true @@ -50,6 +52,6 @@ var config = { }; if (typeof module !== 'undefined') { - module.exports = config; + module.exports = config; } From e65c8f83023c70a644a80bbd5781357433617946 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 27 Sep 2016 11:27:00 +0200 Subject: [PATCH 05/32] config updates --- config.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config.js b/config.js index 04245fb..aa386d5 100644 --- a/config.js +++ b/config.js @@ -19,6 +19,8 @@ var config = { url: "http://api16.gamewheel.com", port: 3104, debugPort: 3204, + cluster: false, + cors: false, mailer: { host: 'localhost', port: 9025, @@ -44,9 +46,6 @@ var config = { autoIndex: false } }, - server: { - cluster: false - }, sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' } }; From 892f05c4e342b48644c4c77c2458c4910d14cd73 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Thu, 1 Dec 2016 11:55:37 +0100 Subject: [PATCH 06/32] upload path --- secure.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/secure.js b/secure.js index dc697e5..38a3b37 100644 --- a/secure.js +++ b/secure.js @@ -91,6 +91,24 @@ var secure = { autoIndex: false } }, + uploadPath : 'uploads', + // mailer: { + // host: "smtp.office365.com", + // port: 587, + // auth: { + // user: "admin@gamewheel.com", + // pass: "Toypro42!" + // }, + // secureConnection: false, + // tls: { + // ciphers: "SSLv3", + // rejectUnauthorized: false + // }, + // emails: { + // founder: "evgeni@gamewheel.com", + // support: "support@gamewheel.com" + // } + // }, mailer: { host: 'localhost', port: 9025, From 61b2d8fe9326a83f67f843727c550f262558b919 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Mon, 19 Dec 2016 15:15:09 +0000 Subject: [PATCH 07/32] racing --- config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.js b/config.js index 4b2e604..46572cc 100644 --- a/config.js +++ b/config.js @@ -3,7 +3,7 @@ var config = { url: "http://pong.gamewheel.com" }, vr_racer: { - url: "http://racer.gamewheel.com" + url: "http://3d-racing.gamewheel.com" }, editor: { url: "http://3d-editor.gamewheel.com", From ef6b0e44f471c673c6ddda1b614b308b80d289c4 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Mon, 19 Dec 2016 15:47:17 +0000 Subject: [PATCH 08/32] config updates --- 3d-racing.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3d-racing.conf b/3d-racing.conf index 90154fe..234eac6 100644 --- a/3d-racing.conf +++ b/3d-racing.conf @@ -2,9 +2,9 @@ server { listen 80; - server_name 3d-racing.gamewheel.local 3d-racing-debug.gamewheel.local; + server_name 3d-racing.gamewheel.com 3d-racing-debug.gamewheel.com; - root /usr/share/gamewheel/3d-racing; + root /srv/gamewheel.com/racing/3d-racing; index index.html; From f00b357252fe239dbefd4afb9d3e23d38a190caf Mon Sep 17 00:00:00 2001 From: cybafelo Date: Fri, 13 Jan 2017 12:47:53 +0000 Subject: [PATCH 09/32] pong only editor --- config.js | 12 ++++++++++++ secure.js | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/config.js b/config.js index 46572cc..14a4945 100644 --- a/config.js +++ b/config.js @@ -14,9 +14,21 @@ var config = { }, uploadPath: '/uploads' }, + pong_editor: { + url: "http://3d-pong-editor.gamewheel.com", + default: { + platform: 'gamewheel', + account: 'root', + subAccount: 'root' + }, + uploadPath: '/uploads' + }, api16: { url: "http://api16.gamewheel.com", }, + api16pong: { + url: "http://api16pong.gamewheel.com", + }, tools: { url: "http://tools.gamewheel.com", default: { diff --git a/secure.js b/secure.js index 38a3b37..d4307af 100644 --- a/secure.js +++ b/secure.js @@ -12,6 +12,11 @@ var secure = { debugPort: 3203, cluster: false }, + pong_editor: { + port: 3112, + debugPort: 3212, + cluster: false + }, api16: { port: 3104, debugPort: 3204, @@ -44,6 +49,38 @@ var secure = { }, sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' }, + api16pong: { + port: 3113, + debugPort: 3213, + cluster: false, + cors: false, + mailer: { + host: 'localhost', + port: 9025, + secure: false, + debug: true, + ignoreTLS: true + }, + mongodb: { + host: 'mongodb://127.0.0.1', + db: 'gw_pong', + port: 27017, + shardPort: 27018, + options: { + db: { + native_parser: true + }, + server: { + poolSize: 5, + keepAlive: 120 + }, + user: '', + pass: '', + autoIndex: false + } + }, + sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' + }, tools: { port: 3105, debugPort: 3205, From d360aad222f4d43ef84f9e19754edd0896810afe Mon Sep 17 00:00:00 2001 From: cybafelo Date: Mon, 16 Jan 2017 08:19:07 +0000 Subject: [PATCH 10/32] port available client side too --- config.js | 3 ++- secure.js | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.js b/config.js index 14a4945..3679f22 100644 --- a/config.js +++ b/config.js @@ -1,6 +1,7 @@ var config = { vr_pong: { - url: "http://pong.gamewheel.com" + port: 3101, + url: "http://fetch.gamewheel.com" }, vr_racer: { url: "http://3d-racing.gamewheel.com" diff --git a/secure.js b/secure.js index d4307af..c70eeaf 100644 --- a/secure.js +++ b/secure.js @@ -1,6 +1,5 @@ var secure = { vr_pong: { - port: 3101, debugPort: 3201 }, vr_racer: { From 80085dd37f88520623543dc3d0ee6be8a82db4c9 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 17 Jan 2017 13:53:12 +0100 Subject: [PATCH 11/32] vr pong clients need to know the port --- config.js | 1 + secure.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/config.js b/config.js index faa8579..54489f4 100644 --- a/config.js +++ b/config.js @@ -1,5 +1,6 @@ var config = { vr_pong: { + port: 3101, url: "http://pong.gamewheel.local" }, vr_racer: { diff --git a/secure.js b/secure.js index 38a3b37..8b21276 100644 --- a/secure.js +++ b/secure.js @@ -1,6 +1,5 @@ var secure = { vr_pong: { - port: 3101, debugPort: 3201 }, vr_racer: { From eeb4a743800f6c1b3e241d75bc68872c17de19ca Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Fri, 20 Jan 2017 15:30:13 +0100 Subject: [PATCH 12/32] getting pong ready --- config.js | 4 +-- 3d-editor.conf => nginx/3d-editor.conf | 0 3d-racing.conf => nginx/3d-racing.conf | 0 api-runtime.conf => nginx/api-runtime.conf | 0 api.conf => nginx/api.conf | 0 api16.conf => nginx/api16.conf | 0 app.conf => nginx/app.conf | 0 nginx/dev-core.conf | 34 +++++++++++++++++++ nginx/games.conf | 15 +++++++++ gate.conf => nginx/gate.conf | 0 nginx/masker.conf | 37 ++++++++++++++++++++ nginx/pong.conf | 38 +++++++++++++++++++++ port.conf => nginx/port.conf | 0 nginx/racer.conf | 34 +++++++++++++++++++ nginx/redirect.conf | 37 ++++++++++++++++++++ tools.conf => nginx/tools.conf | 0 nginx/www.conf | 39 ++++++++++++++++++++++ secure.js | 1 + 18 files changed, 237 insertions(+), 2 deletions(-) rename 3d-editor.conf => nginx/3d-editor.conf (100%) rename 3d-racing.conf => nginx/3d-racing.conf (100%) rename api-runtime.conf => nginx/api-runtime.conf (100%) rename api.conf => nginx/api.conf (100%) rename api16.conf => nginx/api16.conf (100%) rename app.conf => nginx/app.conf (100%) create mode 100644 nginx/dev-core.conf create mode 100644 nginx/games.conf rename gate.conf => nginx/gate.conf (100%) create mode 100644 nginx/masker.conf create mode 100644 nginx/pong.conf rename port.conf => nginx/port.conf (100%) create mode 100644 nginx/racer.conf create mode 100644 nginx/redirect.conf rename tools.conf => nginx/tools.conf (100%) create mode 100644 nginx/www.conf diff --git a/config.js b/config.js index 54489f4..620000b 100644 --- a/config.js +++ b/config.js @@ -1,6 +1,5 @@ var config = { vr_pong: { - port: 3101, url: "http://pong.gamewheel.local" }, vr_racer: { @@ -11,7 +10,8 @@ var config = { default: { platform: 'gamewheel', account: 'root', - subAccount: 'root' + subAccount: 'root', + nameOfTheGame: 'test' }, uploadPath: '/uploads' }, diff --git a/3d-editor.conf b/nginx/3d-editor.conf similarity index 100% rename from 3d-editor.conf rename to nginx/3d-editor.conf diff --git a/3d-racing.conf b/nginx/3d-racing.conf similarity index 100% rename from 3d-racing.conf rename to nginx/3d-racing.conf diff --git a/api-runtime.conf b/nginx/api-runtime.conf similarity index 100% rename from api-runtime.conf rename to nginx/api-runtime.conf diff --git a/api.conf b/nginx/api.conf similarity index 100% rename from api.conf rename to nginx/api.conf diff --git a/api16.conf b/nginx/api16.conf similarity index 100% rename from api16.conf rename to nginx/api16.conf diff --git a/app.conf b/nginx/app.conf similarity index 100% rename from app.conf rename to nginx/app.conf diff --git a/nginx/dev-core.conf b/nginx/dev-core.conf new file mode 100644 index 0000000..6116112 --- /dev/null +++ b/nginx/dev-core.conf @@ -0,0 +1,34 @@ +server { + listen 80; + listen 443 ssl; + + server_name dev-core.gamewheel.local; + + root /srv/gamewheel.local/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; + + ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + ssl_session_timeout 5m; + ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + ssl_prefer_server_ciphers on; + + add_header Access-Control-Allow-Origin '*'; + + location / { + autoindex on; + try_files $uri $uri/ /index.php?$args; + } + + location ~ \.*.php$ { + include fastcgi_params; + fastcgi_split_path_info ^(.+\.php)(.*)$; + fastcgi_pass 127.0.0.1:9001; + fastcgi_intercept_errors on; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } +} diff --git a/nginx/games.conf b/nginx/games.conf new file mode 100644 index 0000000..d85c33d --- /dev/null +++ b/nginx/games.conf @@ -0,0 +1,15 @@ +server { + listen 80; + + server_name games.gamewheel.local; + + root /srv/gamewheel.local/games; + index index.html index.htm; + + add_header Access-Control-Allow-Origin "$http_origin"; + + location / { + autoindex on; + try_files $uri $uri/ =404; + } +} diff --git a/gate.conf b/nginx/gate.conf similarity index 100% rename from gate.conf rename to nginx/gate.conf diff --git a/nginx/masker.conf b/nginx/masker.conf new file mode 100644 index 0000000..8664f00 --- /dev/null +++ b/nginx/masker.conf @@ -0,0 +1,37 @@ +server { + listen 80; + # listen 443 ssl; + # Replace here with proper server FQDN + server_name masker.gamewheel.local; + + # 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; + + # Replace here with proper certificates paths + # ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + # ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + + #ssl_session_timeout 5m; + #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + #ssl_prefer_server_ciphers on; + + # Replace here with proper allowed origins + # add_header Access-Control-Allow-Origin "http://app.gamewheel.local"; + # 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'; + + 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; + # Replace here with proper host/port + proxy_pass http://127.0.0.1:3300; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/pong.conf b/nginx/pong.conf new file mode 100644 index 0000000..9c7e630 --- /dev/null +++ b/nginx/pong.conf @@ -0,0 +1,38 @@ +server { + listen 80; + listen 443 ssl; + + server_name pong.gamewheel.local pong-debug.gamewheel.local; + + root /usr/share/gamewheel/vr_pong/; + index index.html; + + access_log /var/log/nginx/pong.gamewheel.local.access.log; + error_log /var/log/nginx/pong.gamewheel.local.error.log; + + ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + ssl_session_timeout 5m; + ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + ssl_prefer_server_ciphers on; + + add_header Access-Control-Allow-Origin '*'; + + location / { + add_header Access-Control-Allow-Origin $http_origin; + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { + 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:3101; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/port.conf b/nginx/port.conf similarity index 100% rename from port.conf rename to nginx/port.conf diff --git a/nginx/racer.conf b/nginx/racer.conf new file mode 100644 index 0000000..613fb9f --- /dev/null +++ b/nginx/racer.conf @@ -0,0 +1,34 @@ +server { + listen 80; + listen 443 ssl; + + server_name racer.gamewheel.local racer-debug.gamewheel.local; + + root /srv/gamewheel.local/racer; + index index.html; + + access_log /var/log/nginx/racer.gamewheel.local.access.log; + error_log /var/log/nginx/racer.gamewheel.local.error.log; + + ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + ssl_session_timeout 5m; + ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + ssl_prefer_server_ciphers on; + + add_header Access-Control-Allow-Origin '*'; + + location / { + autoindex on; + try_files $uri $uri/ /index.html?$args; + } + + location ~ \.*.php$ { + include fastcgi_params; + fastcgi_split_path_info ^(.+\.php)(.*)$; + fastcgi_pass 127.0.0.1:9001; + fastcgi_intercept_errors on; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } +} diff --git a/nginx/redirect.conf b/nginx/redirect.conf new file mode 100644 index 0000000..5c048fb --- /dev/null +++ b/nginx/redirect.conf @@ -0,0 +1,37 @@ +### +# https://gamewheel.local +# redirect to +# https://www.gamewheeel.local +### + +server { + + listen 443 ssl; + server_name gamewheel.local; + + ssl off; + ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + ssl_session_timeout 5m; + ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + ssl_prefer_server_ciphers on; + + return 301 https://www.gamewheel.local$request_uri; +} + + +### +# http://(www.)gamewheel.local +# redirect to +# https://www.gamewheeel.com +### + +server { + + listen 80; + server_name gamewheel.local www.gamewheel.local; + + return 301 https://www.gamewheel.local$request_uri; +} + diff --git a/tools.conf b/nginx/tools.conf similarity index 100% rename from tools.conf rename to nginx/tools.conf diff --git a/nginx/www.conf b/nginx/www.conf new file mode 100644 index 0000000..e0c8d01 --- /dev/null +++ b/nginx/www.conf @@ -0,0 +1,39 @@ +server { + listen 80; + listen 443 ssl; + + server_name www.gamewheel.local; + + root /srv/gamewheel.local/www; + index index.php; + + access_log /var/log/nginx/www.gamewheel.local.access.log; + error_log /var/log/nginx/www.gamewheel.local.error.log; + + ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + ssl_session_timeout 5m; + ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + ssl_prefer_server_ciphers on; + + + rewrite ^/sitemap(-+([a-zA-Z0-9_-]+))?\.xml$ "/index.php?xml_sitemap=params=$2" last; + rewrite ^/sitemap(-+([a-zA-Z0-9_-]+))?\.xml\.gz$ "/index.php?xml_sitemap=params=$2;zip=true" last; + rewrite ^/sitemap(-+([a-zA-Z0-9_-]+))?\.html$ "/index.php?xml_sitemap=params=$2;html=true" last; + rewrite ^/sitemap(-+([a-zA-Z0-9_-]+))?\.html.gz$ "/index.php?xml_sitemap=params=$2;html=true;zip=true" last; + + add_header Access-Control-Allow-Origin '*'; + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location ~ \.*.php$ { + include fastcgi_params; + fastcgi_split_path_info ^(.+\.php)(.*)$; + fastcgi_pass 127.0.0.1:9001; + fastcgi_intercept_errors on; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } +} diff --git a/secure.js b/secure.js index 8b21276..38a3b37 100644 --- a/secure.js +++ b/secure.js @@ -1,5 +1,6 @@ var secure = { vr_pong: { + port: 3101, debugPort: 3201 }, vr_racer: { From f61ed452561ff4fd865bcec441c27b518930dfa1 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Fri, 20 Jan 2017 14:33:31 +0000 Subject: [PATCH 13/32] pong config --- config.js | 2 +- pong.conf | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 pong.conf diff --git a/config.js b/config.js index 3679f22..75136c5 100644 --- a/config.js +++ b/config.js @@ -1,7 +1,7 @@ var config = { vr_pong: { port: 3101, - url: "http://fetch.gamewheel.com" + url: "http://3doo.gamewheel.com" }, vr_racer: { url: "http://3d-racing.gamewheel.com" diff --git a/pong.conf b/pong.conf new file mode 100644 index 0000000..b7b79cd --- /dev/null +++ b/pong.conf @@ -0,0 +1,49 @@ +server { + listen 80; + #listen 443 ssl; + + server_name 3doo.gamewheel.com; + + root /srv/gamewheel.com/vr_pong_fetch; + index index.html; + + # Log Config + access_log /var/log/nginx/3d-editor.gamewheel.com.access.log; + error_log /var/log/nginx/3d-editor.gamewheel.com.error.log; + + # SSL Config + #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + #ssl_session_timeout 5m; + #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + #ssl_prefer_server_ciphers on; + + add_header 'Access-Control-Allow-Origin' '$http_origin'; + + location / { + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { + 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:3101; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + + + # WebSocket support (nginx 1.4) + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + + # Path rewriting +# rewrite /(.*) /$1 break; + + proxy_redirect off; + } +} From 721d77160c6f0dfc82f2d6352dfdc97d56d96f30 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Fri, 20 Jan 2017 15:57:30 +0100 Subject: [PATCH 14/32] websocket handshake --- nginx/pong.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nginx/pong.conf b/nginx/pong.conf index 9c7e630..3a42b85 100644 --- a/nginx/pong.conf +++ b/nginx/pong.conf @@ -26,6 +26,12 @@ server { } location @node { + # WebSocket support + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + + # 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; From b28dfd0c31e7b36c422bef8f353f895f88f0f363 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Mon, 23 Jan 2017 09:03:55 +0000 Subject: [PATCH 15/32] websocket support for nginx --- pong.conf | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pong.conf b/pong.conf index b7b79cd..d90ca4f 100644 --- a/pong.conf +++ b/pong.conf @@ -36,13 +36,10 @@ server { proxy_set_header Host $http_host; - # WebSocket support (nginx 1.4) - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - - # Path rewriting -# rewrite /(.*) /$1 break; + # WebSocket support (nginx 1.4) + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; proxy_redirect off; } From 673a3257e6e8dd356b76c21bdcd322836b1342f8 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Mon, 23 Jan 2017 09:06:46 +0000 Subject: [PATCH 16/32] moved port to server side --- config.js | 1 - secure.js | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/config.js b/config.js index 75136c5..d2d9803 100644 --- a/config.js +++ b/config.js @@ -1,6 +1,5 @@ var config = { vr_pong: { - port: 3101, url: "http://3doo.gamewheel.com" }, vr_racer: { diff --git a/secure.js b/secure.js index c70eeaf..f352e95 100644 --- a/secure.js +++ b/secure.js @@ -1,5 +1,6 @@ var secure = { vr_pong: { + port: 3101 debugPort: 3201 }, vr_racer: { From a0f6bf0648dddf45bc03b0e35fdb13ff3db64dc9 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Tue, 24 Jan 2017 09:15:40 +0000 Subject: [PATCH 17/32] moved nginx config to nginx folder --- 3d-editor.conf | 34 ------------------------ 3d-racing.conf | 27 ------------------- api-runtime.conf | 69 ------------------------------------------------ api.conf | 25 ------------------ api16.conf | 25 ------------------ app.conf | 19 ------------- gate.conf | 25 ------------------ pong.conf | 46 -------------------------------- port.conf | 25 ------------------ secure.js | 2 +- tools.conf | 34 ------------------------ 11 files changed, 1 insertion(+), 330 deletions(-) delete mode 100644 3d-editor.conf delete mode 100644 3d-racing.conf delete mode 100644 api-runtime.conf delete mode 100644 api.conf delete mode 100644 api16.conf delete mode 100644 app.conf delete mode 100644 gate.conf delete mode 100644 pong.conf delete mode 100644 port.conf delete mode 100644 tools.conf diff --git a/3d-editor.conf b/3d-editor.conf deleted file mode 100644 index e913ec0..0000000 --- a/3d-editor.conf +++ /dev/null @@ -1,34 +0,0 @@ -#origin git@github.com:ToywheelDev/3d_editor.git -server { - listen 80; - - server_name 3d-editor.gamewheel.local 3d-editor-debug.gamewheel.local; - - root /usr/share/gamewheel/gw_3d_editor; - - location ~ \.php$ { - fastcgi_pass 127.0.0.1:9001; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SCRIPT_URL $request_uri; - fastcgi_param SERVER_NAME $http_host; - include fastcgi_params; - } - - location / { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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:3103; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/3d-racing.conf b/3d-racing.conf deleted file mode 100644 index 234eac6..0000000 --- a/3d-racing.conf +++ /dev/null @@ -1,27 +0,0 @@ -#origin https://github.com/ToywheelDev/3d-racing.git -server { - listen 80; - - server_name 3d-racing.gamewheel.com 3d-racing-debug.gamewheel.com; - - root /srv/gamewheel.com/racing/3d-racing; - - index index.html; - - location / { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/api-runtime.conf b/api-runtime.conf deleted file mode 100644 index ced8b3d..0000000 --- a/api-runtime.conf +++ /dev/null @@ -1,69 +0,0 @@ -#origin git@github.com:ToywheelDev/GW_Runtime.git -#origin git@github.com:ToywheelDev/gw-statistic.git -server { - listen 80; - - server_name api-runtime.gamewheel.local; - - #root /usr/share/gamewheel/GW_Runtime - port 3108 (old api runtime) - #root /usr/share/gamewheel/gw-statistic - port 3109 (new api runtime) - - location /lead/trigger/ { - auth_basic "Restricted"; #For Basic Auth - auth_basic_user_file /etc/nginx/.htpasswd; #For Basic Auth - 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:3109; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_read_timeout 99999s; - proxy_connect_timeout 99999s; - proxy_send_timeout 99999s; - } - - location /form { - 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:3108; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_read_timeout 99999s; - proxy_connect_timeout 99999s; - proxy_send_timeout 99999s; - } - - location /lead { - 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:3108; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_read_timeout 99999s; - proxy_connect_timeout 99999s; - proxy_send_timeout 99999s; - } - - 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:3109; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_read_timeout 99999s; - proxy_connect_timeout 99999s; - proxy_send_timeout 99999s; - } -} - diff --git a/api.conf b/api.conf deleted file mode 100644 index a27fd68..0000000 --- a/api.conf +++ /dev/null @@ -1,25 +0,0 @@ -#origin git@github.com:ToywheelDev/gamewheel-api.git -server { - listen 80; - - server_name api.gamewheel.local; - - root /usr/share/gamewheel/api; - - location / { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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:3107; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/api16.conf b/api16.conf deleted file mode 100644 index ed97c13..0000000 --- a/api16.conf +++ /dev/null @@ -1,25 +0,0 @@ -#origin git@github.com:ToywheelDev/GW_Config.git -server { - listen 80; - - server_name api16.gamewheel.local; - - root /usr/share/gamewheel/GW_Config; - - location / { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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:3104; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/app.conf b/app.conf deleted file mode 100644 index d0b2fd9..0000000 --- a/app.conf +++ /dev/null @@ -1,19 +0,0 @@ -#origin git@github.com:ToywheelDev/gw-app.git -server { - listen 80; - - server_name app.gamewheel.local; - - root /usr/share/gamewheel/gw-app/dist; - - 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:3106; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/gate.conf b/gate.conf deleted file mode 100644 index b537eba..0000000 --- a/gate.conf +++ /dev/null @@ -1,25 +0,0 @@ -#origin git@github.com:ToywheelDev/gamewheel-gate.git -server { - listen 80; - - server_name gate.gamewheel.local; - - root /usr/share/gamewheel/gate; - - location / { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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:3111; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/pong.conf b/pong.conf deleted file mode 100644 index d90ca4f..0000000 --- a/pong.conf +++ /dev/null @@ -1,46 +0,0 @@ -server { - listen 80; - #listen 443 ssl; - - server_name 3doo.gamewheel.com; - - root /srv/gamewheel.com/vr_pong_fetch; - index index.html; - - # Log Config - access_log /var/log/nginx/3d-editor.gamewheel.com.access.log; - error_log /var/log/nginx/3d-editor.gamewheel.com.error.log; - - # SSL Config - #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - #ssl_session_timeout 5m; - #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; - #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; - #ssl_prefer_server_ciphers on; - - add_header 'Access-Control-Allow-Origin' '$http_origin'; - - location / { - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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:3101; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - - - # WebSocket support (nginx 1.4) - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - - proxy_redirect off; - } -} diff --git a/port.conf b/port.conf deleted file mode 100644 index 1738fe6..0000000 --- a/port.conf +++ /dev/null @@ -1,25 +0,0 @@ -#origin git@github.com:ToywheelDev/gamewheel-port.git -server { - listen 80; - - server_name port.gamewheel.local; - - root /usr/share/gamewheel/port; - - location / { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/secure.js b/secure.js index f352e95..d4307af 100644 --- a/secure.js +++ b/secure.js @@ -1,6 +1,6 @@ var secure = { vr_pong: { - port: 3101 + port: 3101, debugPort: 3201 }, vr_racer: { diff --git a/tools.conf b/tools.conf deleted file mode 100644 index e857551..0000000 --- a/tools.conf +++ /dev/null @@ -1,34 +0,0 @@ -#origin git@github.com:ToywheelDev/tools.git -server { - listen 80; - - server_name tools.gamewheel.local tools-debug.gamewheel.local; - - root /usr/share/gamewheel/tools; - - location ~ \.php$ { - fastcgi_pass 127.0.0.1:9001; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SCRIPT_URL $request_uri; - fastcgi_param SERVER_NAME $http_host; - include fastcgi_params; - } - - location / { - add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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:3105; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} From ca9e4e69c81eddb2b5474383af70e3101a4b4081 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Tue, 24 Jan 2017 09:18:26 +0000 Subject: [PATCH 18/32] nginx config --- nginx/.3d-editor-v2.conf.swp | Bin 0 -> 12288 bytes nginx/3d-editor-v2.conf | 39 ++++++++++++++++++++ nginx/3d-editor.conf | 39 ++++++++++++++++++++ nginx/3d-pong-editor.conf | 39 ++++++++++++++++++++ nginx/3d-racing.conf | 27 ++++++++++++++ nginx/api-runtime.conf | 69 +++++++++++++++++++++++++++++++++++ nginx/api-v2.conf | 38 +++++++++++++++++++ nginx/api.conf | 25 +++++++++++++ nginx/api16.conf | 38 +++++++++++++++++++ nginx/api16pong.conf | 38 +++++++++++++++++++ nginx/app.conf | 19 ++++++++++ nginx/gate.conf | 25 +++++++++++++ nginx/pong.conf | 46 +++++++++++++++++++++++ nginx/port.conf | 25 +++++++++++++ nginx/salesshuttle.de | 50 +++++++++++++++++++++++++ nginx/tools.conf | 34 +++++++++++++++++ 16 files changed, 551 insertions(+) create mode 100644 nginx/.3d-editor-v2.conf.swp create mode 100644 nginx/3d-editor-v2.conf create mode 100644 nginx/3d-editor.conf create mode 100644 nginx/3d-pong-editor.conf create mode 100644 nginx/3d-racing.conf create mode 100644 nginx/api-runtime.conf create mode 100644 nginx/api-v2.conf create mode 100644 nginx/api.conf create mode 100644 nginx/api16.conf create mode 100644 nginx/api16pong.conf create mode 100644 nginx/app.conf create mode 100644 nginx/gate.conf create mode 100644 nginx/pong.conf create mode 100644 nginx/port.conf create mode 100644 nginx/salesshuttle.de create mode 100644 nginx/tools.conf diff --git a/nginx/.3d-editor-v2.conf.swp b/nginx/.3d-editor-v2.conf.swp new file mode 100644 index 0000000000000000000000000000000000000000..4fe76e522900bd61dfd490ed1daa4a3f6cb65aa2 GIT binary patch literal 12288 zcmeI2zi-<{6vxlm+%!#*j75u+ZNSr!qUgYe+@cMVv^F3oL6ihuT7n^u5@CwR-koH- zMUb&mJGWC&plgP7>(=}i&72`avL;#c{NkA;j=tF)MOFq>Y z5g-CYfCvx)B5(=`gfU~!K49$kvq&EQ|4)Dazdp~{bLa{5FZ2uaGn7Dm=oWMZT7VvZ z#MnR3U(gTG=g<=L@*HD-L%%`4Lf=8(LN}l8h3+Mv$0(m`# z{)GO3$~+%JbP)j}Km>>Y5g-CYfCvzQ{~>|w9hgc)+)7 z?~3av>D?7K%Z$0zWBGpTua({pbu43n9$%?98pd&O5G2#7viJTdw`7=!?VEf>%aO7& zK!D>O<%Y1|@5jw{AD<0h6~HaMR`%S37% zlb)c7(qbrelWjFW9a-Ai{${J&3a{Vk^}4N{tCu)19v$np{HxdcOUSy3t*nYvW_Z8f zoA~^8uRrnXyEAP&Q{(B2V$+dSW6Lj%rZbV$Hce8Xlfj-mIo@wQOKUU7uaMQMWxgC3Q8^AyQfsAyObxg@3AKyPymIoHvU8{MabSux z!s=K~7@&4)A}sSBR<9G{$f$lDs=G6^qYR6brSyDG{ktCrb;)}$0cy6`9CVH%c|KDP oKa>B=l!)cM@xYlesNSC}HCE<)ZO!L60wmE4Y_vC7y$)W{H?7>LqW}N^ literal 0 HcmV?d00001 diff --git a/nginx/3d-editor-v2.conf b/nginx/3d-editor-v2.conf new file mode 100644 index 0000000..a714b4a --- /dev/null +++ b/nginx/3d-editor-v2.conf @@ -0,0 +1,39 @@ +server { + listen 80; + #listen 443 ssl; + + server_name 3d-editor-v2.gamewheel.com 3d-editor-v2-debug.gamewheel.com; + + root /srv/gamewheel.com/3d_editor_v2; + index index.html; + + # Log Config + access_log /var/log/nginx/3d-editor-v2.gamewheel.com.access.log; + error_log /var/log/nginx/3d-editor-v2.gamewheel.com.error.log; + + # SSL Config + #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + #ssl_session_timeout 5m; + #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + #ssl_prefer_server_ciphers on; + + add_header 'Access-Control-Allow-Origin' '$http_origin'; + + location / { + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { + 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:3103; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/3d-editor.conf b/nginx/3d-editor.conf new file mode 100644 index 0000000..e178d75 --- /dev/null +++ b/nginx/3d-editor.conf @@ -0,0 +1,39 @@ +server { + listen 80; + #listen 443 ssl; + + server_name 3d-editor.gamewheel.com 3d-editor-debug.gamewheel.com; + + root /srv/gamewheel.com/3d_editor; + index index.html; + + # Log Config + access_log /var/log/nginx/3d-editor.gamewheel.com.access.log; + error_log /var/log/nginx/3d-editor.gamewheel.com.error.log; + + # SSL Config + #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + #ssl_session_timeout 5m; + #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + #ssl_prefer_server_ciphers on; + + add_header 'Access-Control-Allow-Origin' '$http_origin'; + + location / { + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { + 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:3103; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/3d-pong-editor.conf b/nginx/3d-pong-editor.conf new file mode 100644 index 0000000..0baaa03 --- /dev/null +++ b/nginx/3d-pong-editor.conf @@ -0,0 +1,39 @@ +server { + listen 80; + #listen 443 ssl; + + server_name 3d-pong-editor.gamewheel.com; + + root /srv/gamewheel.com/3d_pong_editor; + index index.html; + + # Log Config + access_log /var/log/nginx/3d-editor.gamewheel.com.access.log; + error_log /var/log/nginx/3d-editor.gamewheel.com.error.log; + + # SSL Config + #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + #ssl_session_timeout 5m; + #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + #ssl_prefer_server_ciphers on; + + add_header 'Access-Control-Allow-Origin' '$http_origin'; + + location / { + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { + 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:3112; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/3d-racing.conf b/nginx/3d-racing.conf new file mode 100644 index 0000000..234eac6 --- /dev/null +++ b/nginx/3d-racing.conf @@ -0,0 +1,27 @@ +#origin https://github.com/ToywheelDev/3d-racing.git +server { + listen 80; + + server_name 3d-racing.gamewheel.com 3d-racing-debug.gamewheel.com; + + root /srv/gamewheel.com/racing/3d-racing; + + index index.html; + + location / { + add_header Access-Control-Allow-Origin $http_origin; + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { + 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_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/api-runtime.conf b/nginx/api-runtime.conf new file mode 100644 index 0000000..ced8b3d --- /dev/null +++ b/nginx/api-runtime.conf @@ -0,0 +1,69 @@ +#origin git@github.com:ToywheelDev/GW_Runtime.git +#origin git@github.com:ToywheelDev/gw-statistic.git +server { + listen 80; + + server_name api-runtime.gamewheel.local; + + #root /usr/share/gamewheel/GW_Runtime - port 3108 (old api runtime) + #root /usr/share/gamewheel/gw-statistic - port 3109 (new api runtime) + + location /lead/trigger/ { + auth_basic "Restricted"; #For Basic Auth + auth_basic_user_file /etc/nginx/.htpasswd; #For Basic Auth + 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:3109; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + proxy_read_timeout 99999s; + proxy_connect_timeout 99999s; + proxy_send_timeout 99999s; + } + + location /form { + 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:3108; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + proxy_read_timeout 99999s; + proxy_connect_timeout 99999s; + proxy_send_timeout 99999s; + } + + location /lead { + 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:3108; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + proxy_read_timeout 99999s; + proxy_connect_timeout 99999s; + proxy_send_timeout 99999s; + } + + 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:3109; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + proxy_read_timeout 99999s; + proxy_connect_timeout 99999s; + proxy_send_timeout 99999s; + } +} + diff --git a/nginx/api-v2.conf b/nginx/api-v2.conf new file mode 100644 index 0000000..7fd87e2 --- /dev/null +++ b/nginx/api-v2.conf @@ -0,0 +1,38 @@ +server { + listen 80; + #listen 443 ssl; + + server_name api16.gamewheel.com api16-debug.gamewheel.com; + + root /srv/gamewheel.com/GW_Config; + + # Replace here with proper logs paths + access_log /var/log/nginx/api16.gamewheel.com.access.log; + error_log /var/log/nginx/api16.gamewheel.com.error.log; + + # Replace here with proper certificates paths + #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + + #ssl_session_timeout 5m; + #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + #ssl_prefer_server_ciphers on; + + # Replace here with proper allowed origins + # add_header Access-Control-Allow-Origin "$http_origin"; + # 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'; + + 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:3104; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/api.conf b/nginx/api.conf new file mode 100644 index 0000000..a27fd68 --- /dev/null +++ b/nginx/api.conf @@ -0,0 +1,25 @@ +#origin git@github.com:ToywheelDev/gamewheel-api.git +server { + listen 80; + + server_name api.gamewheel.local; + + root /usr/share/gamewheel/api; + + location / { + add_header Access-Control-Allow-Origin $http_origin; + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { + 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:3107; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/api16.conf b/nginx/api16.conf new file mode 100644 index 0000000..7fd87e2 --- /dev/null +++ b/nginx/api16.conf @@ -0,0 +1,38 @@ +server { + listen 80; + #listen 443 ssl; + + server_name api16.gamewheel.com api16-debug.gamewheel.com; + + root /srv/gamewheel.com/GW_Config; + + # Replace here with proper logs paths + access_log /var/log/nginx/api16.gamewheel.com.access.log; + error_log /var/log/nginx/api16.gamewheel.com.error.log; + + # Replace here with proper certificates paths + #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + + #ssl_session_timeout 5m; + #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + #ssl_prefer_server_ciphers on; + + # Replace here with proper allowed origins + # add_header Access-Control-Allow-Origin "$http_origin"; + # 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'; + + 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:3104; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/api16pong.conf b/nginx/api16pong.conf new file mode 100644 index 0000000..bffcae6 --- /dev/null +++ b/nginx/api16pong.conf @@ -0,0 +1,38 @@ +server { + listen 80; + #listen 443 ssl; + + server_name api16pong.gamewheel.com; + + root /srv/gamewheel.com/GW_Config; + + # Replace here with proper logs paths + access_log /var/log/nginx/api16.gamewheel.com.access.log; + error_log /var/log/nginx/api16.gamewheel.com.error.log; + + # Replace here with proper certificates paths + #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + + #ssl_session_timeout 5m; + #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + #ssl_prefer_server_ciphers on; + + # Replace here with proper allowed origins + # add_header Access-Control-Allow-Origin "http://app.gamewheel.local"; + # 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'; + + 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:3113; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/app.conf b/nginx/app.conf new file mode 100644 index 0000000..d0b2fd9 --- /dev/null +++ b/nginx/app.conf @@ -0,0 +1,19 @@ +#origin git@github.com:ToywheelDev/gw-app.git +server { + listen 80; + + server_name app.gamewheel.local; + + root /usr/share/gamewheel/gw-app/dist; + + 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:3106; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/gate.conf b/nginx/gate.conf new file mode 100644 index 0000000..b537eba --- /dev/null +++ b/nginx/gate.conf @@ -0,0 +1,25 @@ +#origin git@github.com:ToywheelDev/gamewheel-gate.git +server { + listen 80; + + server_name gate.gamewheel.local; + + root /usr/share/gamewheel/gate; + + location / { + add_header Access-Control-Allow-Origin $http_origin; + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { + 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:3111; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/pong.conf b/nginx/pong.conf new file mode 100644 index 0000000..d90ca4f --- /dev/null +++ b/nginx/pong.conf @@ -0,0 +1,46 @@ +server { + listen 80; + #listen 443 ssl; + + server_name 3doo.gamewheel.com; + + root /srv/gamewheel.com/vr_pong_fetch; + index index.html; + + # Log Config + access_log /var/log/nginx/3d-editor.gamewheel.com.access.log; + error_log /var/log/nginx/3d-editor.gamewheel.com.error.log; + + # SSL Config + #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + #ssl_session_timeout 5m; + #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + #ssl_prefer_server_ciphers on; + + add_header 'Access-Control-Allow-Origin' '$http_origin'; + + location / { + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { + 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:3101; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + + + # WebSocket support (nginx 1.4) + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + + proxy_redirect off; + } +} diff --git a/nginx/port.conf b/nginx/port.conf new file mode 100644 index 0000000..1738fe6 --- /dev/null +++ b/nginx/port.conf @@ -0,0 +1,25 @@ +#origin git@github.com:ToywheelDev/gamewheel-port.git +server { + listen 80; + + server_name port.gamewheel.local; + + root /usr/share/gamewheel/port; + + location / { + add_header Access-Control-Allow-Origin $http_origin; + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { + 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_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/salesshuttle.de b/nginx/salesshuttle.de new file mode 100644 index 0000000..bd66677 --- /dev/null +++ b/nginx/salesshuttle.de @@ -0,0 +1,50 @@ +server { + listen 80; + #listen 443 ssl; + + server_name salesshuttle.de www.salesshuttle.de; + + root /srv/salesshuttle.de/www; + index index.php; + + # Log Config + access_log /var/log/nginx/salesshuttle.de.access.log; + error_log /var/log/nginx/salesshuttle.de.error.log; + + # SSL Config + #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + #ssl_session_timeout 5m; + #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; + #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; + #ssl_prefer_server_ciphers on; + + add_header 'Access-Control-Allow-Origin' '$http_origin'; + + location / { + add_header Access-Control-Allow-Origin $http_origin; + autoindex on; + try_files $uri $uri/ /index.php?$args; + } + + location ~ \.php$ { + fastcgi_pass 127.0.0.1:9001; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param SCRIPT_URL $request_uri; + fastcgi_param SERVER_NAME $http_host; + include fastcgi_params; + } + + +# location @node { +# 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:3103; +# proxy_ssl_session_reuse off; +# proxy_set_header Host $http_host; +# proxy_redirect off; +# } +} diff --git a/nginx/tools.conf b/nginx/tools.conf new file mode 100644 index 0000000..e857551 --- /dev/null +++ b/nginx/tools.conf @@ -0,0 +1,34 @@ +#origin git@github.com:ToywheelDev/tools.git +server { + listen 80; + + server_name tools.gamewheel.local tools-debug.gamewheel.local; + + root /usr/share/gamewheel/tools; + + location ~ \.php$ { + fastcgi_pass 127.0.0.1:9001; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param SCRIPT_URL $request_uri; + fastcgi_param SERVER_NAME $http_host; + include fastcgi_params; + } + + location / { + add_header Access-Control-Allow-Origin $http_origin; + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { + 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:3105; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} From f8d628b7c05357317d588c40ea4692486845fec0 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Tue, 24 Jan 2017 09:20:00 +0000 Subject: [PATCH 19/32] config updates --- config.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config.js b/config.js index d2d9803..4759f33 100644 --- a/config.js +++ b/config.js @@ -59,6 +59,12 @@ var config = { gate: { url: 'http://gate.gamewheel.com' }, + 3d_editor_v2: { + url: 'http://3d-editor-v2.gamewheel.com' + }, + api_v2: { + url: 'http://api-v2.gamewheel.com' + }, environment: { mode: 'production' } From b434fdfad5155fc2168ff6b9f20ae9d56c6caeed Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 24 Jan 2017 10:23:24 +0100 Subject: [PATCH 20/32] api and editor v2 configs --- config.js | 2 +- nginx/3d-editor-v2.conf | 12 +----------- nginx/api-v2.conf | 38 ++++++++++++-------------------------- secure.js | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 38 deletions(-) diff --git a/config.js b/config.js index 4759f33..2477843 100644 --- a/config.js +++ b/config.js @@ -59,7 +59,7 @@ var config = { gate: { url: 'http://gate.gamewheel.com' }, - 3d_editor_v2: { + editor_v2: { url: 'http://3d-editor-v2.gamewheel.com' }, api_v2: { diff --git a/nginx/3d-editor-v2.conf b/nginx/3d-editor-v2.conf index a714b4a..773da79 100644 --- a/nginx/3d-editor-v2.conf +++ b/nginx/3d-editor-v2.conf @@ -1,24 +1,14 @@ server { listen 80; - #listen 443 ssl; server_name 3d-editor-v2.gamewheel.com 3d-editor-v2-debug.gamewheel.com; root /srv/gamewheel.com/3d_editor_v2; index index.html; - # Log Config access_log /var/log/nginx/3d-editor-v2.gamewheel.com.access.log; error_log /var/log/nginx/3d-editor-v2.gamewheel.com.error.log; - # SSL Config - #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - #ssl_session_timeout 5m; - #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; - #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; - #ssl_prefer_server_ciphers on; - add_header 'Access-Control-Allow-Origin' '$http_origin'; location / { @@ -31,7 +21,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://127.0.0.1:3112; proxy_ssl_session_reuse off; proxy_set_header Host $http_host; proxy_redirect off; diff --git a/nginx/api-v2.conf b/nginx/api-v2.conf index 7fd87e2..fd52d1e 100644 --- a/nginx/api-v2.conf +++ b/nginx/api-v2.conf @@ -1,38 +1,24 @@ server { listen 80; - #listen 443 ssl; - server_name api16.gamewheel.com api16-debug.gamewheel.com; + server_name api-v2.gamewheel.com api-v2-debug.gamewheel.com; - root /srv/gamewheel.com/GW_Config; + root /srv/gamewheel.com/api_v2; - # Replace here with proper logs paths - access_log /var/log/nginx/api16.gamewheel.com.access.log; - error_log /var/log/nginx/api16.gamewheel.com.error.log; + access_log /var/log/nginx/api_v2.gamewheel.com.access.log; + error_log /var/log/nginx/api_v2.gamewheel.com.error.log; - # Replace here with proper certificates paths - #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - - #ssl_session_timeout 5m; - #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; - #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; - #ssl_prefer_server_ciphers on; - - # Replace here with proper allowed origins - # add_header Access-Control-Allow-Origin "$http_origin"; - # 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'; 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:3104; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; + 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:3113; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; } } diff --git a/secure.js b/secure.js index d4307af..0f5a747 100644 --- a/secure.js +++ b/secure.js @@ -200,6 +200,43 @@ var secure = { gate: { port: 3111, debugPort: 3211 + }, + editor_v2: { + port: 3112, + debugPort: 3212, + cluster: false + }, + api_v2: { + port: 3113, + debugPort: 3213, + liveReloadPort: 3413, + mongodb: { + host: 'mongodb://127.0.0.1', + db: 'api_v2', + port: 27017, + shardPort: 27018, + options: { + db: { + native_parser: true + }, + server: { + poolSize: 5, + keepAlive: 120 + }, + user: '', + pass: '', + autoIndex: false + } + }, + uploadPath : 'uploads', + mailer: { + host: 'localhost', + port: 9025, + secure: false, + debug: true, + ignoreTLS: true + }, + sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' } }; From b10a269d6aa2c659bd921f0a2387e7a4e42e0dd1 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Tue, 24 Jan 2017 09:25:45 +0000 Subject: [PATCH 21/32] rm swap! --- nginx/.3d-editor-v2.conf.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 nginx/.3d-editor-v2.conf.swp diff --git a/nginx/.3d-editor-v2.conf.swp b/nginx/.3d-editor-v2.conf.swp deleted file mode 100644 index 4fe76e522900bd61dfd490ed1daa4a3f6cb65aa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2zi-<{6vxlm+%!#*j75u+ZNSr!qUgYe+@cMVv^F3oL6ihuT7n^u5@CwR-koH- zMUb&mJGWC&plgP7>(=}i&72`avL;#c{NkA;j=tF)MOFq>Y z5g-CYfCvx)B5(=`gfU~!K49$kvq&EQ|4)Dazdp~{bLa{5FZ2uaGn7Dm=oWMZT7VvZ z#MnR3U(gTG=g<=L@*HD-L%%`4Lf=8(LN}l8h3+Mv$0(m`# z{)GO3$~+%JbP)j}Km>>Y5g-CYfCvzQ{~>|w9hgc)+)7 z?~3av>D?7K%Z$0zWBGpTua({pbu43n9$%?98pd&O5G2#7viJTdw`7=!?VEf>%aO7& zK!D>O<%Y1|@5jw{AD<0h6~HaMR`%S37% zlb)c7(qbrelWjFW9a-Ai{${J&3a{Vk^}4N{tCu)19v$np{HxdcOUSy3t*nYvW_Z8f zoA~^8uRrnXyEAP&Q{(B2V$+dSW6Lj%rZbV$Hce8Xlfj-mIo@wQOKUU7uaMQMWxgC3Q8^AyQfsAyObxg@3AKyPymIoHvU8{MabSux z!s=K~7@&4)A}sSBR<9G{$f$lDs=G6^qYR6brSyDG{ktCrb;)}$0cy6`9CVH%c|KDP oKa>B=l!)cM@xYlesNSC}HCE<)ZO!L60wmE4Y_vC7y$)W{H?7>LqW}N^ From 5ed153aaa026e3cea916a9842a8e258398f9e805 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Tue, 24 Jan 2017 09:54:21 +0000 Subject: [PATCH 22/32] updated config --- secure.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/secure.js b/secure.js index 0f5a747..4276abe 100644 --- a/secure.js +++ b/secure.js @@ -202,14 +202,14 @@ var secure = { debugPort: 3211 }, editor_v2: { - port: 3112, - debugPort: 3212, + port: 3114, + debugPort: 3214, cluster: false }, api_v2: { - port: 3113, - debugPort: 3213, - liveReloadPort: 3413, + port: 3115, + debugPort: 3215, + liveReloadPort: 3415, mongodb: { host: 'mongodb://127.0.0.1', db: 'api_v2', From 4f7e5498c7cdd905378973d700478eab802030db Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 24 Jan 2017 10:53:55 +0100 Subject: [PATCH 23/32] updated ports --- nginx/3d-editor-v2.conf | 2 +- nginx/api-v2.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx/3d-editor-v2.conf b/nginx/3d-editor-v2.conf index 773da79..c0d6af5 100644 --- a/nginx/3d-editor-v2.conf +++ b/nginx/3d-editor-v2.conf @@ -21,7 +21,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:3112; + proxy_pass http://127.0.0.1:3114; proxy_ssl_session_reuse off; proxy_set_header Host $http_host; proxy_redirect off; diff --git a/nginx/api-v2.conf b/nginx/api-v2.conf index fd52d1e..07f64f8 100644 --- a/nginx/api-v2.conf +++ b/nginx/api-v2.conf @@ -16,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:3113; + proxy_pass http://127.0.0.1:3115; proxy_ssl_session_reuse off; proxy_set_header Host $http_host; proxy_redirect off; From a829d8959949dfa342d355666cc7b981a151b44b Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 24 Jan 2017 11:01:30 +0100 Subject: [PATCH 24/32] config default updates --- config.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/config.js b/config.js index 2477843..fc302f3 100644 --- a/config.js +++ b/config.js @@ -24,10 +24,10 @@ var config = { uploadPath: '/uploads' }, api16: { - url: "http://api16.gamewheel.com", + url: "http://api16.gamewheel.com" }, api16pong: { - url: "http://api16pong.gamewheel.com", + url: "http://api16pong.gamewheel.com" }, tools: { url: "http://tools.gamewheel.com", @@ -60,7 +60,14 @@ var config = { url: 'http://gate.gamewheel.com' }, editor_v2: { - url: 'http://3d-editor-v2.gamewheel.com' + url: 'http://3d-editor-v2.gamewheel.com', + default: { + platform: 'gamewheel', + account: 'root', + subAccount: 'root', + nameOfTheGame: 'test' + }, + uploadPath: '/uploads' }, api_v2: { url: 'http://api-v2.gamewheel.com' From 26c459cd556196f0ea221224857770bd5edf9e65 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Tue, 24 Jan 2017 10:15:58 +0000 Subject: [PATCH 25/32] start script for all services --- start | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 start diff --git a/start b/start new file mode 100755 index 0000000..44af57e --- /dev/null +++ b/start @@ -0,0 +1,17 @@ +#!/bin/bash +cd /srv/gamewheel.com/GW_Config +pm2 start bin/start --name api-v1 +cd /srv/gamewheel.com/3d_editor +pm2 start server.js --node-args="--max-old-space-size=16000" --name 3d-editor +cd /srv/gamewheel.com/api16_pong +pm2 start bin/start --name api-v1-pong +cd /srv/gamewheel.com/3d_pong_editor +pm2 start server.js --node-args="--max-old-space-size=16000" --name 3d-editor-pong +cd /srv/gamewheel.com/racing/3D-Racing-Server +pm2 start app.js --name 3d-racing +cd /srv/gamewheel.com/3d_editor_v2 +pm2 start server.js --node-args="--max-old-space-size=16000" --name 3d-editor-v2 +cd /srv/gamewheel.com/api_v2 +pm2 start bin/start --name api-v2 +cd /srv/gamewheel.com/vr_pong_fetch +pm2 start pong-socket-server.js --name 3doo-pong From 22eabb2978c6477a7e47e0b30dac599072768c59 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Tue, 24 Jan 2017 10:20:08 +0000 Subject: [PATCH 26/32] pm2 control scripts --- delete | 9 +++++++++ logs | 2 ++ restart | 2 ++ start | 16 ++++++++-------- stop | 2 ++ 5 files changed, 23 insertions(+), 8 deletions(-) create mode 100755 delete create mode 100755 logs create mode 100755 restart create mode 100755 stop diff --git a/delete b/delete new file mode 100755 index 0000000..ead3856 --- /dev/null +++ b/delete @@ -0,0 +1,9 @@ +#!/bin/bash +pm2 delete api-v1 +pm2 delete api-v1-pong +pm2 delete api-v2 +pm2 delete 3d-editor +pm2 delete 3d-editor-pong +pm2 delete 3d-editor-v2 +pm2 delete 3d-racing +pm2 delete 3doo-pong diff --git a/logs b/logs new file mode 100755 index 0000000..228cc63 --- /dev/null +++ b/logs @@ -0,0 +1,2 @@ +#!/bin/bash +pm2 logs diff --git a/restart b/restart new file mode 100755 index 0000000..847081a --- /dev/null +++ b/restart @@ -0,0 +1,2 @@ +#!/bin/bash +pm2 restart all diff --git a/start b/start index 44af57e..f359d47 100755 --- a/start +++ b/start @@ -1,17 +1,17 @@ #!/bin/bash cd /srv/gamewheel.com/GW_Config pm2 start bin/start --name api-v1 -cd /srv/gamewheel.com/3d_editor -pm2 start server.js --node-args="--max-old-space-size=16000" --name 3d-editor cd /srv/gamewheel.com/api16_pong pm2 start bin/start --name api-v1-pong -cd /srv/gamewheel.com/3d_pong_editor -pm2 start server.js --node-args="--max-old-space-size=16000" --name 3d-editor-pong -cd /srv/gamewheel.com/racing/3D-Racing-Server -pm2 start app.js --name 3d-racing -cd /srv/gamewheel.com/3d_editor_v2 -pm2 start server.js --node-args="--max-old-space-size=16000" --name 3d-editor-v2 cd /srv/gamewheel.com/api_v2 pm2 start bin/start --name api-v2 +cd /srv/gamewheel.com/3d_editor +pm2 start server.js --node-args="--max-old-space-size=16000" --name 3d-editor +cd /srv/gamewheel.com/3d_pong_editor +pm2 start server.js --node-args="--max-old-space-size=16000" --name 3d-editor-pong +cd /srv/gamewheel.com/3d_editor_v2 +pm2 start server.js --node-args="--max-old-space-size=16000" --name 3d-editor-v2 +cd /srv/gamewheel.com/racing/3D-Racing-Server +pm2 start app.js --name 3d-racing cd /srv/gamewheel.com/vr_pong_fetch pm2 start pong-socket-server.js --name 3doo-pong diff --git a/stop b/stop new file mode 100755 index 0000000..7db3ba3 --- /dev/null +++ b/stop @@ -0,0 +1,2 @@ +#!/bin/bash +pm2 stop all From c08a26ee176a7ae9491b7090337fad853168fcd5 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 24 Jan 2017 12:55:37 +0100 Subject: [PATCH 27/32] hosts also in config --- config.js | 83 +++++++++------------ hosts | 27 +++++++ nginx/3d-editor-v2.conf | 9 +-- nginx/3d-editor.conf | 2 +- nginx/3d-pong-editor.conf | 39 ---------- nginx/{pong.conf => 3d-pong.conf} | 15 +--- nginx/3d-racing.conf | 2 +- nginx/{api16.conf => api-v1.6.conf} | 4 +- nginx/api-v2.conf | 9 +-- nginx/api16pong.conf | 38 ---------- nginx/{ => backup}/api-runtime.conf | 0 nginx/{ => backup}/api.conf | 0 nginx/{ => backup}/app.conf | 0 nginx/{ => backup}/dev-core.conf | 0 nginx/{ => backup}/games.conf | 0 nginx/{ => backup}/gate.conf | 0 nginx/{ => backup}/masker.conf | 0 nginx/{ => backup}/port.conf | 0 nginx/{ => backup}/redirect.conf | 0 nginx/{ => backup}/salesshuttle.de | 0 nginx/{ => backup}/www.conf | 0 nginx/racer.conf | 34 --------- nginx/tools.conf | 2 +- secure.js | 111 ++++++++++------------------ 24 files changed, 112 insertions(+), 263 deletions(-) create mode 100644 hosts delete mode 100644 nginx/3d-pong-editor.conf rename nginx/{pong.conf => 3d-pong.conf} (60%) rename nginx/{api16.conf => api-v1.6.conf} (83%) delete mode 100644 nginx/api16pong.conf rename nginx/{ => backup}/api-runtime.conf (100%) rename nginx/{ => backup}/api.conf (100%) rename nginx/{ => backup}/app.conf (100%) rename nginx/{ => backup}/dev-core.conf (100%) rename nginx/{ => backup}/games.conf (100%) rename nginx/{ => backup}/gate.conf (100%) rename nginx/{ => backup}/masker.conf (100%) rename nginx/{ => backup}/port.conf (100%) rename nginx/{ => backup}/redirect.conf (100%) rename nginx/{ => backup}/salesshuttle.de (100%) rename nginx/{ => backup}/www.conf (100%) delete mode 100644 nginx/racer.conf diff --git a/config.js b/config.js index d197ad8..ead7e32 100644 --- a/config.js +++ b/config.js @@ -1,12 +1,12 @@ var config = { vr_pong: { - url: "http://3doo.gamewheel.com" + url: "http://3d-pong.gamewheel.local" }, vr_racer: { - url: "http://3d-racing.gamewheel.com" + url: "http://3d-racing.gamewheel.local" }, editor: { - url: "http://3d-editor.gamewheel.com", + url: "http://3d-editor.gamewheel.local", default: { platform: 'gamewheel', account: 'root', @@ -14,54 +14,11 @@ var config = { }, uploadPath: '/uploads' }, - pong_editor: { - url: "http://3d-pong-editor.gamewheel.com", - default: { - platform: 'gamewheel', - account: 'root', - subAccount: 'root', - nameOfTheGame: 'test' - }, - uploadPath: '/uploads' - }, api16: { - url: "http://api16.gamewheel.com" - }, - api16pong: { - url: "http://api16pong.gamewheel.com" - }, - tools: { - url: "http://tools.gamewheel.com", - default: { - platform: 'gamewheel', - account: 'root', - subAccount: 'root' - } - }, - app: { - url: 'http://app.gamewheel.com' - }, - api: { - url: 'http://api.gamewheel.com' - }, - api_runtime: { - url: 'http://api-runtime.gamewheel.com', - version: "1.0.0" - }, - masker: { - url: 'http://masker.gamewheel.com' - }, - statistics: { - url: 'http://api-runtime.gamewheel.com' - }, - port: { - url: 'http://port.gamewheel.com' - }, - gate: { - url: 'http://gate.gamewheel.com' + url: "http://api-v1.6.gamewheel.local" }, editor_v2: { - url: 'http://3d-editor-v2.gamewheel.com', + url: 'http://3d-editor-v2.gamewheel.local', default: { platform: 'gamewheel', account: 'root', @@ -73,6 +30,36 @@ var config = { api_v2: { url: 'http://api-v2.gamewheel.com' }, + tools: { + url: "http://tools.gamewheel.local", + default: { + platform: 'gamewheel', + account: 'root', + subAccount: 'root' + } + }, + app: { + url: 'http://app.gamewheel.local' + }, + api: { + url: 'http://api.gamewheel.local' + }, + api_runtime: { + url: 'http://api-runtime.gamewheel.local', + version: "1.0.0" + }, + masker: { + url: 'http://masker.gamewheel.local' + }, + statistics: { + url: 'http://api-runtime.gamewheel.local' + }, + port: { + url: 'http://port.gamewheel.local' + }, + gate: { + url: 'http://gate.gamewheel.local' + }, environment: { mode: 'production' } diff --git a/hosts b/hosts new file mode 100644 index 0000000..0ebfed1 --- /dev/null +++ b/hosts @@ -0,0 +1,27 @@ +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-pong.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 tools.gamewheel.local +127.0.1.1 tools-debug.gamewheel.local + + +# The following lines are desirable for IPv6 capable hosts +::1 ip6-localhost ip6-loopback +fe00::0 ip6-localnet +ff00::0 ip6-mcastprefix +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters diff --git a/nginx/3d-editor-v2.conf b/nginx/3d-editor-v2.conf index c0d6af5..abfc659 100644 --- a/nginx/3d-editor-v2.conf +++ b/nginx/3d-editor-v2.conf @@ -1,14 +1,11 @@ server { listen 80; - server_name 3d-editor-v2.gamewheel.com 3d-editor-v2-debug.gamewheel.com; + server_name 3d-editor-v2.gamewheel.local 3d-editor-v2-debug.gamewheel.local; - root /srv/gamewheel.com/3d_editor_v2; + root /srv/gamewheel.com/3d-editor-v2; index index.html; - access_log /var/log/nginx/3d-editor-v2.gamewheel.com.access.log; - error_log /var/log/nginx/3d-editor-v2.gamewheel.com.error.log; - add_header 'Access-Control-Allow-Origin' '$http_origin'; location / { @@ -21,7 +18,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:3114; + proxy_pass http://127.0.0.1:3105; proxy_ssl_session_reuse off; proxy_set_header Host $http_host; proxy_redirect off; diff --git a/nginx/3d-editor.conf b/nginx/3d-editor.conf index e913ec0..f2b609d 100644 --- a/nginx/3d-editor.conf +++ b/nginx/3d-editor.conf @@ -4,7 +4,7 @@ server { server_name 3d-editor.gamewheel.local 3d-editor-debug.gamewheel.local; - root /usr/share/gamewheel/gw_3d_editor; + root /usr/share/gamewheel/3d-editor; location ~ \.php$ { fastcgi_pass 127.0.0.1:9001; diff --git a/nginx/3d-pong-editor.conf b/nginx/3d-pong-editor.conf deleted file mode 100644 index 0baaa03..0000000 --- a/nginx/3d-pong-editor.conf +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen 80; - #listen 443 ssl; - - server_name 3d-pong-editor.gamewheel.com; - - root /srv/gamewheel.com/3d_pong_editor; - index index.html; - - # Log Config - access_log /var/log/nginx/3d-editor.gamewheel.com.access.log; - error_log /var/log/nginx/3d-editor.gamewheel.com.error.log; - - # SSL Config - #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - #ssl_session_timeout 5m; - #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; - #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; - #ssl_prefer_server_ciphers on; - - add_header 'Access-Control-Allow-Origin' '$http_origin'; - - location / { - autoindex on; - try_files $uri $uri/ @node; - } - - location @node { - 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:3112; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/nginx/pong.conf b/nginx/3d-pong.conf similarity index 60% rename from nginx/pong.conf rename to nginx/3d-pong.conf index 3a42b85..9e2074a 100644 --- a/nginx/pong.conf +++ b/nginx/3d-pong.conf @@ -1,22 +1,11 @@ server { listen 80; - listen 443 ssl; - server_name pong.gamewheel.local pong-debug.gamewheel.local; + server_name 3d-pong.gamewheel.local 3d-pong-debug.gamewheel.local; - root /usr/share/gamewheel/vr_pong/; + root /usr/share/gamewheel/3d-pong; index index.html; - access_log /var/log/nginx/pong.gamewheel.local.access.log; - error_log /var/log/nginx/pong.gamewheel.local.error.log; - - ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - ssl_session_timeout 5m; - ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; - ssl_prefer_server_ciphers on; - add_header Access-Control-Allow-Origin '*'; location / { diff --git a/nginx/3d-racing.conf b/nginx/3d-racing.conf index 234eac6..ea3a3d9 100644 --- a/nginx/3d-racing.conf +++ b/nginx/3d-racing.conf @@ -2,7 +2,7 @@ server { listen 80; - server_name 3d-racing.gamewheel.com 3d-racing-debug.gamewheel.com; + server_name 3d-racing.gamewheel.local 3d-racing-debug.gamewheel.local; root /srv/gamewheel.com/racing/3d-racing; diff --git a/nginx/api16.conf b/nginx/api-v1.6.conf similarity index 83% rename from nginx/api16.conf rename to nginx/api-v1.6.conf index ed97c13..d7ea313 100644 --- a/nginx/api16.conf +++ b/nginx/api-v1.6.conf @@ -2,9 +2,9 @@ server { listen 80; - server_name api16.gamewheel.local; + server_name api-v1.6.gamewheel.local api-v1.6-debug.gamewheel.local; - root /usr/share/gamewheel/GW_Config; + root /usr/share/gamewheel/api-v1.6; location / { add_header Access-Control-Allow-Origin $http_origin; diff --git a/nginx/api-v2.conf b/nginx/api-v2.conf index 07f64f8..be5d608 100644 --- a/nginx/api-v2.conf +++ b/nginx/api-v2.conf @@ -1,12 +1,9 @@ server { listen 80; - server_name api-v2.gamewheel.com api-v2-debug.gamewheel.com; + server_name api-v2.gamewheel.local api-v2-debug.gamewheel.local; - root /srv/gamewheel.com/api_v2; - - access_log /var/log/nginx/api_v2.gamewheel.com.access.log; - error_log /var/log/nginx/api_v2.gamewheel.com.error.log; + root /srv/gamewheel.com/api-v2; 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'; @@ -16,7 +13,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:3115; + proxy_pass http://127.0.0.1:3106; proxy_ssl_session_reuse off; proxy_set_header Host $http_host; proxy_redirect off; diff --git a/nginx/api16pong.conf b/nginx/api16pong.conf deleted file mode 100644 index bffcae6..0000000 --- a/nginx/api16pong.conf +++ /dev/null @@ -1,38 +0,0 @@ -server { - listen 80; - #listen 443 ssl; - - server_name api16pong.gamewheel.com; - - root /srv/gamewheel.com/GW_Config; - - # Replace here with proper logs paths - access_log /var/log/nginx/api16.gamewheel.com.access.log; - error_log /var/log/nginx/api16.gamewheel.com.error.log; - - # Replace here with proper certificates paths - #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - - #ssl_session_timeout 5m; - #ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; - #ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; - #ssl_prefer_server_ciphers on; - - # Replace here with proper allowed origins - # add_header Access-Control-Allow-Origin "http://app.gamewheel.local"; - # 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'; - - 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:3113; - proxy_ssl_session_reuse off; - proxy_set_header Host $http_host; - proxy_redirect off; - } -} diff --git a/nginx/api-runtime.conf b/nginx/backup/api-runtime.conf similarity index 100% rename from nginx/api-runtime.conf rename to nginx/backup/api-runtime.conf diff --git a/nginx/api.conf b/nginx/backup/api.conf similarity index 100% rename from nginx/api.conf rename to nginx/backup/api.conf diff --git a/nginx/app.conf b/nginx/backup/app.conf similarity index 100% rename from nginx/app.conf rename to nginx/backup/app.conf diff --git a/nginx/dev-core.conf b/nginx/backup/dev-core.conf similarity index 100% rename from nginx/dev-core.conf rename to nginx/backup/dev-core.conf diff --git a/nginx/games.conf b/nginx/backup/games.conf similarity index 100% rename from nginx/games.conf rename to nginx/backup/games.conf diff --git a/nginx/gate.conf b/nginx/backup/gate.conf similarity index 100% rename from nginx/gate.conf rename to nginx/backup/gate.conf diff --git a/nginx/masker.conf b/nginx/backup/masker.conf similarity index 100% rename from nginx/masker.conf rename to nginx/backup/masker.conf diff --git a/nginx/port.conf b/nginx/backup/port.conf similarity index 100% rename from nginx/port.conf rename to nginx/backup/port.conf diff --git a/nginx/redirect.conf b/nginx/backup/redirect.conf similarity index 100% rename from nginx/redirect.conf rename to nginx/backup/redirect.conf diff --git a/nginx/salesshuttle.de b/nginx/backup/salesshuttle.de similarity index 100% rename from nginx/salesshuttle.de rename to nginx/backup/salesshuttle.de diff --git a/nginx/www.conf b/nginx/backup/www.conf similarity index 100% rename from nginx/www.conf rename to nginx/backup/www.conf diff --git a/nginx/racer.conf b/nginx/racer.conf deleted file mode 100644 index 613fb9f..0000000 --- a/nginx/racer.conf +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen 80; - listen 443 ssl; - - server_name racer.gamewheel.local racer-debug.gamewheel.local; - - root /srv/gamewheel.local/racer; - index index.html; - - access_log /var/log/nginx/racer.gamewheel.local.access.log; - error_log /var/log/nginx/racer.gamewheel.local.error.log; - - ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - ssl_session_timeout 5m; - ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; - ssl_prefer_server_ciphers on; - - add_header Access-Control-Allow-Origin '*'; - - location / { - autoindex on; - try_files $uri $uri/ /index.html?$args; - } - - location ~ \.*.php$ { - include fastcgi_params; - fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_pass 127.0.0.1:9001; - fastcgi_intercept_errors on; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } -} diff --git a/nginx/tools.conf b/nginx/tools.conf index e857551..87e0a8b 100644 --- a/nginx/tools.conf +++ b/nginx/tools.conf @@ -26,7 +26,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:3105; + proxy_pass http://127.0.0.1:3107; proxy_ssl_session_reuse off; proxy_set_header Host $http_host; proxy_redirect off; diff --git a/secure.js b/secure.js index 4276abe..dba613a 100644 --- a/secure.js +++ b/secure.js @@ -12,11 +12,6 @@ var secure = { debugPort: 3203, cluster: false }, - pong_editor: { - port: 3112, - debugPort: 3212, - cluster: false - }, api16: { port: 3104, debugPort: 3204, @@ -49,21 +44,18 @@ var secure = { }, sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' }, - api16pong: { - port: 3113, - debugPort: 3213, - cluster: false, - cors: false, - mailer: { - host: 'localhost', - port: 9025, - secure: false, - debug: true, - ignoreTLS: true - }, + editor_v2: { + port: 3105, + debugPort: 3205, + cluster: false + }, + api_v2: { + port: 3106, + debugPort: 3206, + liveReloadPort: 3406, mongodb: { host: 'mongodb://127.0.0.1', - db: 'gw_pong', + db: 'api_v2', port: 27017, shardPort: 27018, options: { @@ -79,12 +71,20 @@ var secure = { autoIndex: false } }, + uploadPath : 'uploads', + mailer: { + host: 'localhost', + port: 9025, + secure: false, + debug: true, + ignoreTLS: true + }, sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' }, tools: { - port: 3105, - debugPort: 3205, - liveReloadPort: 3405, + port: 3107, + debugPort: 3207, + liveReloadPort: 3407, mysqlUserExport: { host: "127.0.0.1", port: 3306, @@ -102,14 +102,14 @@ var secure = { } }, app: { - port: 3106, - debugPort: 3206, - liveReloadPort: 3406 + port: 3108, + debugPort: 3208, + liveReloadPort: 3408 }, api: { - port: 3107, - debugPort: 3207, - liveReloadPort: 3407, + port: 3109, + debugPort: 3209, + liveReloadPort: 3409, mongodb: { host: 'mongodb://127.0.0.1', db: 'apidev', @@ -156,9 +156,9 @@ var secure = { sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' }, api_runtime: { - port: 3108, - debugPort: 3208, - liveReloadPort: 3408, + port: 3110, + debugPort: 3210, + liveReloadPort: 3410, cors: true, cluster: false, auth: { @@ -185,58 +185,21 @@ var secure = { auth_key: "gw_masker_rocks" }, statistics: { - port: 3109, - debugPort: 3209, - liveReloadPort: 3409, + port: 3111, + debugPort: 3211, + liveReloadPort: 3411, mongodb: { host: 'mongodb://127.0.0.1', db: 'statistic' } }, port: { - port: 3110, - debugPort: 3210 + port: 3112, + debugPort: 3212 }, gate: { - port: 3111, - debugPort: 3211 - }, - editor_v2: { - port: 3114, - debugPort: 3214, - cluster: false - }, - api_v2: { - port: 3115, - debugPort: 3215, - liveReloadPort: 3415, - mongodb: { - host: 'mongodb://127.0.0.1', - db: 'api_v2', - port: 27017, - shardPort: 27018, - options: { - db: { - native_parser: true - }, - server: { - poolSize: 5, - keepAlive: 120 - }, - user: '', - pass: '', - autoIndex: false - } - }, - uploadPath : 'uploads', - mailer: { - host: 'localhost', - port: 9025, - secure: false, - debug: true, - ignoreTLS: true - }, - sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' + port: 3113, + debugPort: 3213 } }; From 0e1b146bfb19139212f3e5e095b22ebf823fb6ae Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 24 Jan 2017 13:16:46 +0100 Subject: [PATCH 28/32] update to start scripts --- delete | 9 +-------- start | 28 ++++++++++++---------------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/delete b/delete index ead3856..b77f3c2 100755 --- a/delete +++ b/delete @@ -1,9 +1,2 @@ #!/bin/bash -pm2 delete api-v1 -pm2 delete api-v1-pong -pm2 delete api-v2 -pm2 delete 3d-editor -pm2 delete 3d-editor-pong -pm2 delete 3d-editor-v2 -pm2 delete 3d-racing -pm2 delete 3doo-pong +pm2 delete all \ No newline at end of file diff --git a/start b/start index f359d47..04b9220 100755 --- a/start +++ b/start @@ -1,17 +1,13 @@ #!/bin/bash -cd /srv/gamewheel.com/GW_Config -pm2 start bin/start --name api-v1 -cd /srv/gamewheel.com/api16_pong -pm2 start bin/start --name api-v1-pong -cd /srv/gamewheel.com/api_v2 -pm2 start bin/start --name api-v2 -cd /srv/gamewheel.com/3d_editor -pm2 start server.js --node-args="--max-old-space-size=16000" --name 3d-editor -cd /srv/gamewheel.com/3d_pong_editor -pm2 start server.js --node-args="--max-old-space-size=16000" --name 3d-editor-pong -cd /srv/gamewheel.com/3d_editor_v2 -pm2 start server.js --node-args="--max-old-space-size=16000" --name 3d-editor-v2 -cd /srv/gamewheel.com/racing/3D-Racing-Server -pm2 start app.js --name 3d-racing -cd /srv/gamewheel.com/vr_pong_fetch -pm2 start pong-socket-server.js --name 3doo-pong +cd /usr/share/gamewheel/api-v1.6 +pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1.6 +cd /usr/share/gamewheel/api-v2 +pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3206" --name api-v2 +cd /usr/share/gamewheel/3d-editor +pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3203" --name 3d-editor +cd /usr/share/gamewheel/3d-editor-v2 +pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3205" --name 3d-editor-v2 +cd /usr/share/gamewheel/3d-pong +pm2 start pong-socket-server.js --node-args="--max-old-space-size=16000 --debug=3201" --name 3d-pong +cd /usr/share/gamewheel/3d-racing-server +pm2 start app.js --node-args="--max-old-space-size=16000 --debug=3202" --name 3d-racing-server From 8e6952dff7bcf680491a77ba1315812330bfafba Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 24 Jan 2017 17:44:43 +0100 Subject: [PATCH 29/32] v3 --- config.js | 17 ++++++++-- hosts | 4 +++ nginx/3d-editor-v2.conf | 2 +- nginx/3d-editor-v3.conf | 26 +++++++++++++++ nginx/3d-racing.conf | 2 +- nginx/api-v2.conf | 2 +- nginx/api-v3.conf | 21 ++++++++++++ nginx/tools.conf | 2 +- secure.js | 73 +++++++++++++++++++++++++++++++---------- start | 10 ++++-- 10 files changed, 133 insertions(+), 26 deletions(-) create mode 100644 nginx/3d-editor-v3.conf create mode 100644 nginx/api-v3.conf diff --git a/config.js b/config.js index ead7e32..eead3f8 100644 --- a/config.js +++ b/config.js @@ -28,7 +28,20 @@ var config = { uploadPath: '/uploads' }, api_v2: { - url: 'http://api-v2.gamewheel.com' + url: 'http://api-v2.gamewheel.local' + }, + editor_v3: { + url: 'http://3d-editor-v3.gamewheel.local', + default: { + platform: 'gamewheel', + account: 'root', + subAccount: 'root', + nameOfTheGame: 'test' + }, + uploadPath: '/uploads' + }, + api_v3: { + url: 'http://api-v3.gamewheel.local' }, tools: { url: "http://tools.gamewheel.local", @@ -61,7 +74,7 @@ var config = { url: 'http://gate.gamewheel.local' }, environment: { - mode: 'production' + mode: 'development' } }; diff --git a/hosts b/hosts index 0ebfed1..b24f2d3 100644 --- a/hosts +++ b/hosts @@ -7,6 +7,8 @@ 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 3d-pong-debug.gamewheel.local 127.0.1.1 3d-racing.gamewheel.local @@ -15,6 +17,8 @@ 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 diff --git a/nginx/3d-editor-v2.conf b/nginx/3d-editor-v2.conf index abfc659..68186fd 100644 --- a/nginx/3d-editor-v2.conf +++ b/nginx/3d-editor-v2.conf @@ -3,7 +3,7 @@ server { server_name 3d-editor-v2.gamewheel.local 3d-editor-v2-debug.gamewheel.local; - root /srv/gamewheel.com/3d-editor-v2; + root /usr/share/gamewheel/3d-editor-v2; index index.html; add_header 'Access-Control-Allow-Origin' '$http_origin'; diff --git a/nginx/3d-editor-v3.conf b/nginx/3d-editor-v3.conf new file mode 100644 index 0000000..00acd01 --- /dev/null +++ b/nginx/3d-editor-v3.conf @@ -0,0 +1,26 @@ +server { + listen 80; + + server_name 3d-editor-v3.gamewheel.local 3d-editor-v3-debug.gamewheel.local; + + root /usr/share/gamewheel/3d-editor-v3; + index index.html; + + add_header 'Access-Control-Allow-Origin' '$http_origin'; + + location / { + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { + 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:3107; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/3d-racing.conf b/nginx/3d-racing.conf index ea3a3d9..90154fe 100644 --- a/nginx/3d-racing.conf +++ b/nginx/3d-racing.conf @@ -4,7 +4,7 @@ server { server_name 3d-racing.gamewheel.local 3d-racing-debug.gamewheel.local; - root /srv/gamewheel.com/racing/3d-racing; + root /usr/share/gamewheel/3d-racing; index index.html; diff --git a/nginx/api-v2.conf b/nginx/api-v2.conf index be5d608..94bde94 100644 --- a/nginx/api-v2.conf +++ b/nginx/api-v2.conf @@ -3,7 +3,7 @@ server { server_name api-v2.gamewheel.local api-v2-debug.gamewheel.local; - root /srv/gamewheel.com/api-v2; + root /usr/share/gamewheel/api-v2; 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'; diff --git a/nginx/api-v3.conf b/nginx/api-v3.conf new file mode 100644 index 0000000..115d7b7 --- /dev/null +++ b/nginx/api-v3.conf @@ -0,0 +1,21 @@ +server { + listen 80; + + server_name api-v3.gamewheel.local api-v3-debug.gamewheel.local; + + root /usr/share/gamewheel/api-v3; + + 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'; + + 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:3108; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} diff --git a/nginx/tools.conf b/nginx/tools.conf index 87e0a8b..ef4c860 100644 --- a/nginx/tools.conf +++ b/nginx/tools.conf @@ -26,7 +26,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:3107; + proxy_pass http://127.0.0.1:3109; proxy_ssl_session_reuse off; proxy_set_header Host $http_host; proxy_redirect off; diff --git a/secure.js b/secure.js index dba613a..b1d74aa 100644 --- a/secure.js +++ b/secure.js @@ -81,10 +81,47 @@ var secure = { }, sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' }, - tools: { + editor_v3: { port: 3107, debugPort: 3207, - liveReloadPort: 3407, + cluster: false + }, + api_v3: { + port: 3108, + debugPort: 3208, + liveReloadPort: 3408, + mongodb: { + host: 'mongodb://127.0.0.1', + db: 'api_v3', + port: 27017, + shardPort: 27018, + options: { + db: { + native_parser: true + }, + server: { + poolSize: 5, + keepAlive: 120 + }, + user: '', + pass: '', + autoIndex: false + } + }, + uploadPath : 'uploads', + mailer: { + host: 'localhost', + port: 9025, + secure: false, + debug: true, + ignoreTLS: true + }, + sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' + }, + tools: { + port: 3109, + debugPort: 3209, + liveReloadPort: 3409, mysqlUserExport: { host: "127.0.0.1", port: 3306, @@ -102,14 +139,14 @@ var secure = { } }, app: { - port: 3108, - debugPort: 3208, - liveReloadPort: 3408 + port: 3110, + debugPort: 3210, + liveReloadPort: 3410 }, api: { - port: 3109, - debugPort: 3209, - liveReloadPort: 3409, + port: 3111, + debugPort: 3211, + liveReloadPort: 3411, mongodb: { host: 'mongodb://127.0.0.1', db: 'apidev', @@ -156,9 +193,9 @@ var secure = { sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' }, api_runtime: { - port: 3110, - debugPort: 3210, - liveReloadPort: 3410, + port: 3112, + debugPort: 3212, + liveReloadPort: 3412, cors: true, cluster: false, auth: { @@ -185,21 +222,21 @@ var secure = { auth_key: "gw_masker_rocks" }, statistics: { - port: 3111, - debugPort: 3211, - liveReloadPort: 3411, + port: 3113, + debugPort: 3213, + liveReloadPort: 3413, mongodb: { host: 'mongodb://127.0.0.1', db: 'statistic' } }, port: { - port: 3112, - debugPort: 3212 + port: 3114, + debugPort: 3214 }, gate: { - port: 3113, - debugPort: 3213 + port: 3115, + debugPort: 3215 } }; diff --git a/start b/start index 04b9220..932a90a 100755 --- a/start +++ b/start @@ -3,11 +3,17 @@ cd /usr/share/gamewheel/api-v1.6 pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1.6 cd /usr/share/gamewheel/api-v2 pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3206" --name api-v2 +cd /usr/share/gamewheel/api-v3 +pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3208" --name api-v3 cd /usr/share/gamewheel/3d-editor pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3203" --name 3d-editor cd /usr/share/gamewheel/3d-editor-v2 pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3205" --name 3d-editor-v2 +cd /usr/share/gamewheel/3d-editor-v3 +pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3207" --name 3d-editor-v3 cd /usr/share/gamewheel/3d-pong pm2 start pong-socket-server.js --node-args="--max-old-space-size=16000 --debug=3201" --name 3d-pong -cd /usr/share/gamewheel/3d-racing-server -pm2 start app.js --node-args="--max-old-space-size=16000 --debug=3202" --name 3d-racing-server +#cd /usr/share/gamewheel/3d-racing-server +#pm2 start app.js --node-args="--max-old-space-size=16000 --debug=3202" --name 3d-racing-server +cd /usr/share/gamewheel/tools +pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3209" --name tools \ No newline at end of file From ca787d0f216bb71163d3913d5e8ed09324859299 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Thu, 26 Jan 2017 11:57:36 +0100 Subject: [PATCH 30/32] scripts --- start_editor_v1 | 5 +++++ start_editor_v2 | 5 +++++ start_editor_v3 | 5 +++++ start_pong | 5 +++++ 4 files changed, 20 insertions(+) create mode 100755 start_editor_v1 create mode 100755 start_editor_v2 create mode 100755 start_editor_v3 create mode 100755 start_pong diff --git a/start_editor_v1 b/start_editor_v1 new file mode 100755 index 0000000..18eb05f --- /dev/null +++ b/start_editor_v1 @@ -0,0 +1,5 @@ +#!/bin/bash +cd /usr/share/gamewheel/api-v1.6 +pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1.6 +cd /usr/share/gamewheel/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_editor_v2 b/start_editor_v2 new file mode 100755 index 0000000..9f730bc --- /dev/null +++ b/start_editor_v2 @@ -0,0 +1,5 @@ +#!/bin/bash +cd /usr/share/gamewheel/api-v2 +pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3206" --name api-v2 +cd /usr/share/gamewheel/3d-editor-v2 +pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3205" --name 3d-editor-v2 \ No newline at end of file diff --git a/start_editor_v3 b/start_editor_v3 new file mode 100755 index 0000000..ee51600 --- /dev/null +++ b/start_editor_v3 @@ -0,0 +1,5 @@ +#!/bin/bash +cd /usr/share/gamewheel/api-v3 +pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3208" --name api-v3 +cd /usr/share/gamewheel/3d-editor-v3 +pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3207" --name 3d-editor-v3 \ No newline at end of file diff --git a/start_pong b/start_pong new file mode 100755 index 0000000..ca6c9fa --- /dev/null +++ b/start_pong @@ -0,0 +1,5 @@ +#!/bin/bash +cd /usr/share/gamewheel/api-v1.6 +pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1.6 +cd /usr/share/gamewheel/3d-pong +pm2 start pong-socket-server.js --node-args="--max-old-space-size=16000 --debug=3201" --name 3d-pong \ No newline at end of file From 14f4e16960fd48119b7561219698f9693ebb359e Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Thu, 26 Jan 2017 18:49:30 +0100 Subject: [PATCH 31/32] config updates --- nginx/3d-pong.conf | 11 +++-------- start | 25 +++++++------------------ start_pong | 2 +- start_racing | 3 +++ start_tools | 3 +++ 5 files changed, 17 insertions(+), 27 deletions(-) create mode 100755 start_racing create mode 100755 start_tools diff --git a/nginx/3d-pong.conf b/nginx/3d-pong.conf index 9e2074a..28bb900 100644 --- a/nginx/3d-pong.conf +++ b/nginx/3d-pong.conf @@ -4,17 +4,12 @@ server { server_name 3d-pong.gamewheel.local 3d-pong-debug.gamewheel.local; root /usr/share/gamewheel/3d-pong; - index index.html; - add_header Access-Control-Allow-Origin '*'; - - location / { + #We start to pass everything to express, otherwise we end up with '/' location saying 403 Forbidden + #Static files delivered trough express.static() + location ~ { add_header Access-Control-Allow-Origin $http_origin; - autoindex on; - try_files $uri $uri/ @node; - } - location @node { # WebSocket support proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; diff --git a/start b/start index 932a90a..ed4b1e7 100755 --- a/start +++ b/start @@ -1,19 +1,8 @@ #!/bin/bash -cd /usr/share/gamewheel/api-v1.6 -pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1.6 -cd /usr/share/gamewheel/api-v2 -pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3206" --name api-v2 -cd /usr/share/gamewheel/api-v3 -pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3208" --name api-v3 -cd /usr/share/gamewheel/3d-editor -pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3203" --name 3d-editor -cd /usr/share/gamewheel/3d-editor-v2 -pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3205" --name 3d-editor-v2 -cd /usr/share/gamewheel/3d-editor-v3 -pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3207" --name 3d-editor-v3 -cd /usr/share/gamewheel/3d-pong -pm2 start pong-socket-server.js --node-args="--max-old-space-size=16000 --debug=3201" --name 3d-pong -#cd /usr/share/gamewheel/3d-racing-server -#pm2 start app.js --node-args="--max-old-space-size=16000 --debug=3202" --name 3d-racing-server -cd /usr/share/gamewheel/tools -pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3209" --name tools \ No newline at end of file +cd /usr/share/gamewheel +./start_editor_v1 +./start_editor_v2 +./start_editor_v3 +./start_pong +./start_racing +./start_tools diff --git a/start_pong b/start_pong index ca6c9fa..26f53f9 100755 --- a/start_pong +++ b/start_pong @@ -2,4 +2,4 @@ cd /usr/share/gamewheel/api-v1.6 pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1.6 cd /usr/share/gamewheel/3d-pong -pm2 start pong-socket-server.js --node-args="--max-old-space-size=16000 --debug=3201" --name 3d-pong \ No newline at end of file +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_racing b/start_racing new file mode 100755 index 0000000..d83cedc --- /dev/null +++ b/start_racing @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +#cd /usr/share/gamewheel/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 new file mode 100755 index 0000000..74c9d8a --- /dev/null +++ b/start_tools @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +cd /usr/share/gamewheel/tools +pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3209" --name tools \ No newline at end of file From 4fa8e2071e95b761a549d38f5c61ef153169f015 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Fri, 3 Feb 2017 17:13:15 +0100 Subject: [PATCH 32/32] uploads to api --- config.js | 6 +++--- nginx/api-v2.conf | 7 +++++++ secure.js | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config.js b/config.js index eead3f8..9240e42 100644 --- a/config.js +++ b/config.js @@ -11,8 +11,7 @@ var config = { platform: 'gamewheel', account: 'root', subAccount: 'root' - }, - uploadPath: '/uploads' + } }, api16: { url: "http://api-v1.6.gamewheel.local" @@ -28,7 +27,8 @@ var config = { uploadPath: '/uploads' }, api_v2: { - url: 'http://api-v2.gamewheel.local' + url: 'http://api-v2.gamewheel.local', + uploadPath : '/uploads' }, editor_v3: { url: 'http://3d-editor-v3.gamewheel.local', diff --git a/nginx/api-v2.conf b/nginx/api-v2.conf index 94bde94..5928795 100644 --- a/nginx/api-v2.conf +++ b/nginx/api-v2.conf @@ -9,6 +9,12 @@ server { 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'; location / { + add_header Access-Control-Allow-Origin $http_origin; + autoindex on; + try_files $uri $uri/ @node; + } + + location @node { proxy_pass_request_headers on; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -18,4 +24,5 @@ server { proxy_set_header Host $http_host; proxy_redirect off; } + } diff --git a/secure.js b/secure.js index b1d74aa..3b5ce7e 100644 --- a/secure.js +++ b/secure.js @@ -71,7 +71,6 @@ var secure = { autoIndex: false } }, - uploadPath : 'uploads', mailer: { host: 'localhost', port: 9025,