merge conflicts

beta.r3js.org
Theunis J. Botha 2017-01-24 12:32:20 +01:00
commit d0fb6ed60c
13 changed files with 326 additions and 15 deletions

View File

@ -1,12 +1,21 @@
var config = {
vr_pong: {
url: "http://pong.gamewheel.local"
url: "http://3doo.gamewheel.com"
},
vr_racer: {
url: "http://racer.gamewheel.local"
url: "http://3d-racing.gamewheel.com"
},
editor: {
url: "http://3d-editor.gamewheel.local",
url: "http://3d-editor.gamewheel.com",
default: {
platform: 'gamewheel',
account: 'root',
subAccount: 'root'
},
uploadPath: '/uploads'
},
pong_editor: {
url: "http://3d-pong-editor.gamewheel.com",
default: {
platform: 'gamewheel',
account: 'root',
@ -16,10 +25,13 @@ var config = {
uploadPath: '/uploads'
},
api16: {
url: "http://api16.gamewheel.local"
url: "http://api16.gamewheel.com"
},
api16pong: {
url: "http://api16pong.gamewheel.com"
},
tools: {
url: "http://tools.gamewheel.local",
url: "http://tools.gamewheel.com",
default: {
platform: 'gamewheel',
account: 'root',
@ -27,29 +39,42 @@ var config = {
}
},
app: {
url: 'http://app.gamewheel.local'
url: 'http://app.gamewheel.com'
},
api: {
url: 'http://api.gamewheel.local'
url: 'http://api.gamewheel.com'
},
api_runtime: {
url: 'http://api-runtime.gamewheel.local',
url: 'http://api-runtime.gamewheel.com',
version: "1.0.0"
},
masker: {
url: 'http://masker.gamewheel.local'
url: 'http://masker.gamewheel.com'
},
statistics: {
url: 'http://api-runtime.gamewheel.local'
url: 'http://api-runtime.gamewheel.com'
},
port: {
url: 'http://port.gamewheel.local'
url: 'http://port.gamewheel.com'
},
gate: {
url: 'http://gate.gamewheel.local'
url: 'http://gate.gamewheel.com'
},
editor_v2: {
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'
},
environment: {
mode: 'development'
mode: 'production'
}
};

9
delete Executable file
View File

@ -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

2
logs Executable file
View File

@ -0,0 +1,2 @@
#!/bin/bash
pm2 logs

29
nginx/3d-editor-v2.conf Normal file
View File

@ -0,0 +1,29 @@
server {
listen 80;
server_name 3d-editor-v2.gamewheel.com 3d-editor-v2-debug.gamewheel.com;
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 / {
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:3114;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;
}
}

39
nginx/3d-pong-editor.conf Normal file
View File

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

View File

@ -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;

24
nginx/api-v2.conf Normal file
View File

@ -0,0 +1,24 @@
server {
listen 80;
server_name api-v2.gamewheel.com api-v2-debug.gamewheel.com;
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;
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:3115;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;
}
}

38
nginx/api16pong.conf Normal file
View File

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

50
nginx/salesshuttle.de Normal file
View File

@ -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;
# }
}

2
restart Executable file
View File

@ -0,0 +1,2 @@
#!/bin/bash
pm2 restart all

View File

@ -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,
@ -163,6 +200,43 @@ var secure = {
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'
}
};

17
start Executable file
View File

@ -0,0 +1,17 @@
#!/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

2
stop Executable file
View File

@ -0,0 +1,2 @@
#!/bin/bash
pm2 stop all