From e45259db64f323fe88b08cf54a2edc1d27fe04df Mon Sep 17 00:00:00 2001 From: cybafelo Date: Mon, 26 Sep 2016 14:19:13 +0000 Subject: [PATCH 01/22] 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/22] 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/22] 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/22] 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/22] 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 61b2d8fe9326a83f67f843727c550f262558b919 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Mon, 19 Dec 2016 15:15:09 +0000 Subject: [PATCH 06/22] 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 07/22] 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 08/22] 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 09/22] 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 f61ed452561ff4fd865bcec441c27b518930dfa1 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Fri, 20 Jan 2017 14:33:31 +0000 Subject: [PATCH 10/22] 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 b28dfd0c31e7b36c422bef8f353f895f88f0f363 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Mon, 23 Jan 2017 09:03:55 +0000 Subject: [PATCH 11/22] 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 12/22] 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 13/22] 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 14/22] 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 15/22] 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 16/22] 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 17/22] 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 18/22] 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 19/22] 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 20/22] 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 21/22] 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 22/22] 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