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