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' } };