From fdcedbe08f319a9e04864d3574e40f2705e4fa19 Mon Sep 17 00:00:00 2001 From: cybafelo Date: Tue, 27 Sep 2016 09:05:32 +0000 Subject: [PATCH 1/7] merge conflicts --- config.js | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/config.js b/config.js index 89e8f28..8b3a135 100644 --- a/config.js +++ b/config.js @@ -1,24 +1,51 @@ var config = { - vr_pong : { - url: "http://pong.gamewheel.local", + vr_pong: { + url: "http://pong", port: 3101, debugPort: 3201 }, - vr_racer : { - url: "http://racer.gamewheel.local", + vr_racer: { + url: "http://racer", port: 3102, debugPort: 3202 }, - editor : { - url: "http://3d-editor.gamewheel.local", + editor: { + url: "http://3d-editor.gamewheel.com", port: 3103, debugPort: 3203, cluster: false }, - api16 : { - url: "http://api.gamewheel.local", + api16: { + url: "http://api16.gamewheel.com", port: 3104, - debugPort: 3204 + 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' } }; From 4bac3bc35bf760ecf579c8d808339d29034c7b80 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 27 Sep 2016 11:12:32 +0200 Subject: [PATCH 2/7] options --- config.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/config.js b/config.js index 8b3a135..6b0fb34 100644 --- a/config.js +++ b/config.js @@ -1,22 +1,22 @@ var config = { vr_pong: { - url: "http://pong", + url: "http://pong.gamewheel.local", port: 3101, debugPort: 3201 }, vr_racer: { - url: "http://racer", + url: "http://racer.gamewheel.local", port: 3102, debugPort: 3202 }, editor: { - url: "http://3d-editor.gamewheel.com", + url: "http://3d-editor.gamewheel.local", port: 3103, debugPort: 3203, cluster: false }, api16: { - url: "http://api16.gamewheel.com", + url: "http://api.gamewheel.local", port: 3104, debugPort: 3204, mailer: { @@ -29,6 +29,8 @@ var config = { mongodb: { host: 'mongodb://127.0.0.1', db: 'gamewheel', + port: 27017, + shardPort: 27018, options: { db: { native_parser: true From 662d55708486b22b9e16a5a0ca06a47ff1f5167e Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 27 Sep 2016 11:27:00 +0200 Subject: [PATCH 3/7] config updates --- config.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config.js b/config.js index 6b0fb34..d1205a4 100644 --- a/config.js +++ b/config.js @@ -19,6 +19,8 @@ var config = { url: "http://api.gamewheel.local", 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 e544b6c4a0325bebe2773e14b80bc6c41f8aae1b Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Wed, 19 Oct 2016 19:32:40 +0200 Subject: [PATCH 4/7] 3d editor config --- 3d-editor.conf | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 3d-editor.conf diff --git a/3d-editor.conf b/3d-editor.conf new file mode 100644 index 0000000..466f988 --- /dev/null +++ b/3d-editor.conf @@ -0,0 +1,46 @@ +server { + listen 80; + listen 443 ssl; + + server_name 3d-editor.gamewheel.local 3d-editor-debug.gamewheel.local; + + root /srv/gamewheel.local/3d-editor; + index index.php; + + access_log /var/log/nginx/3d-editor.gamewheel.local.access.log; + error_log /var/log/nginx/3d-editor.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; + + 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; + # Replace here with proper host/port + proxy_pass http://127.0.0.1:3103; + proxy_ssl_session_reuse off; + proxy_set_header Host $http_host; + proxy_redirect off; + } +} From 21d900baaa6261565a5bc1d26f2a1862fd92887e Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Mon, 24 Oct 2016 15:58:07 +0200 Subject: [PATCH 5/7] revert - will create a build system based on environment --- 3d-editor.conf | 18 +++++++++--------- config.js | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/3d-editor.conf b/3d-editor.conf index 466f988..dd15c76 100644 --- a/3d-editor.conf +++ b/3d-editor.conf @@ -5,7 +5,7 @@ server { server_name 3d-editor.gamewheel.local 3d-editor-debug.gamewheel.local; root /srv/gamewheel.local/3d-editor; - index index.php; + index index.html; access_log /var/log/nginx/3d-editor.gamewheel.local.access.log; error_log /var/log/nginx/3d-editor.gamewheel.local.error.log; @@ -17,14 +17,14 @@ server { ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES"; ssl_prefer_server_ciphers on; - 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 ~ \.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; diff --git a/config.js b/config.js index d1205a4..f7d2201 100644 --- a/config.js +++ b/config.js @@ -47,6 +47,9 @@ var config = { } }, sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23' + }, + environment: { + mode : 'development' } }; From 3e07851f2895028447aa67d5efdd6f64e54c2dc4 Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Tue, 25 Oct 2016 17:59:38 +0200 Subject: [PATCH 6/7] config updates for integration tests --- config.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config.js b/config.js index f7d2201..c43e884 100644 --- a/config.js +++ b/config.js @@ -13,7 +13,13 @@ var config = { url: "http://3d-editor.gamewheel.local", port: 3103, debugPort: 3203, - cluster: false + cluster: false, + default: { + platform: 'gamewheel', + account: 'root', + subAccount: 'root' + }, + uploadPath : '/upload' }, api16: { url: "http://api.gamewheel.local", From d147b68e456a3dfa86706ea1d775de3be39d5e2f Mon Sep 17 00:00:00 2001 From: "Theunis J. Botha" Date: Mon, 31 Oct 2016 09:33:26 +0100 Subject: [PATCH 7/7] config now contains upload data --- config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.js b/config.js index c43e884..3e84b70 100644 --- a/config.js +++ b/config.js @@ -19,7 +19,7 @@ var config = { account: 'root', subAccount: 'root' }, - uploadPath : '/upload' + uploadPath : '/uploads' }, api16: { url: "http://api.gamewheel.local",