cybafelo
/
r3-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge conflicts

beta.r3js.org
Theunis Johannes Botha 2018-04-04 12:34:57 +02:00
parent aea2bc34a0 56f9a0e9c8
commit 631106f401
22 changed files with 17 additions and 540 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,5 +1,2 @@
node_modules
<<<<<<< HEAD
=======
general
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499

17
bash_aliases
View File

@ -1,22 +1,6 @@
alias c='cd /usr/share/cybafelo'
alias s='cd /usr/share/cybafelo && ./start'
alias d='cd /usr/share/cybafelo && ./delete'
<<<<<<< HEAD
alias r='cd /usr/share/cybafelo && ./restart'
alias st='cd /usr/share/cybafelo && ./stop'
alias g='cd /usr/share/cybafelo'
alias 3d='cd /usr/share/cybafelo/3d-editor'
alias gl='cd /usr/share/cybafelo/game-lib'
alias 3d2='cd /usr/share/cybafelo/3d-editor-v2'
alias gl2='cd /usr/share/cybafelo/game-lib-v2'
alias 3d3='cd /usr/share/cybafelo/3d-editor-v3'
alias gl3='cd /usr/share/cybafelo/game-lib-v3'
alias e1='cd /usr/share/cybafelo && ./start_editor_v1'
alias e2='cd /usr/share/cybafelo && ./start_editor_v2'
alias e3='cd /usr/share/cybafelo && ./start_editor_v3'
alias l='cd /usr/share/cybafelo && ./logs'
alias m='pm2 monit'
=======
alias st='cd /usr/share/cybafelo && ./stop'
alias gl='cd /usr/share/cybafelo/game-lib'
alias p='cd /usr/share/cybafelo/preview'
@ -33,4 +17,3 @@ function r() {
/usr/share/cybafelo/restart "$@"
}
export -f r
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499

67
config.js
View File

@ -11,41 +11,6 @@ var domain = environment.domain;
var config = {
vr_pong: {
<<<<<<< HEAD
url: "http://3d-pong.cybafelo.local"
},
vr_racer: {
url: "http://3d-racing.cybafelo.local"
},
editor: {
url: "http://3d-editor.cybafelo.local",
default: {
platform: 'cybafelo',
account: 'root',
subAccount: 'root'
},
uploadPath: '/uploads'
},
api16: {
url: "http://api-v1.6.cybafelo.local"
},
editor_v2: {
url: 'http://3d-editor-v2.cybafelo.local',
default: {
platform: 'cybafelo',
account: 'root',
subAccount: 'root',
nameOfTheGame: 'test'
},
uploadPath: '/uploads'
},
api_v2: {
url: 'http://api-v2.cybafelo.local',
uploadPath : '/uploads'
},
editor_v3: {
url: 'http://3d-editor-v3.cybafelo.local',
=======
url: protocol + '://' + user + '-3d-pong.' + domain
},
vr_racer: {
@ -53,7 +18,6 @@ var config = {
},
editor: {
url: protocol + '://' + user + '-3d-editor.' + domain,
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
default: {
platform: 'cybafelo',
account: 'root',
@ -61,13 +25,6 @@ var config = {
nameOfTheGame: 'test'
}
},
<<<<<<< HEAD
api_v3: {
url: 'http://api-v3.cybafelo.local'
},
tools: {
url: "http://tools.cybafelo.local",
=======
api16: {
url: protocol + '://' + user + '-api-v1.' + domain,
remoteUrl: protocol + '://live-api-v1.flyingspoon.de',
@ -76,7 +33,6 @@ var config = {
},
tools: {
url: protocol + '://' + user + '-tools.' + domain,
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
default: {
platform: 'cybafelo',
account: 'root',
@ -84,28 +40,6 @@ var config = {
}
},
app: {
<<<<<<< HEAD
url: 'http://app.cybafelo.local'
},
api: {
url: 'http://api.cybafelo.local'
},
api_runtime: {
url: 'http://api-runtime.cybafelo.local',
version: "1.0.0"
},
masker: {
url: 'http://masker.cybafelo.local'
},
statistics: {
url: 'http://api-runtime.cybafelo.local'
},
port: {
url: 'http://port.cybafelo.local'
},
gate: {
url: 'http://gate.cybafelo.local'
=======
url: protocol + '://' + user + '-app.' + domain
},
preview: {
@ -134,7 +68,6 @@ var config = {
},
analytics: {
url: protocol + '://' + user + '-analytics.' + domain
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
},
environment: {
mode: 'development'

27
hosts
View File

@ -1,37 +1,12 @@
127.0.0.1 localhost
<<<<<<< HEAD
127.0.1.1 cfo_plista
127.0.1.1 cfo_plista.cybafelo.local
# Gamewheel dev endpoints
127.0.1.1 tj-3d-editor.cybafelo.local
127.0.1.1 tj-api-v1.cybafelo.local
127.0.1.1 tj-preview.cybafelo.local
=======
127.0.1.1 cybafelo
127.0.1.1 cybafelo.cybafelo.local
# Gamewheel dev endpoints
127.0.1.1 tj-3d-editor.cybafelo.local
127.0.1.1 tj-3d-pong.cybafelo.local
127.0.1.1 tj-3doo.cybafelo.local
127.0.1.1 tj-3d-racing.cybafelo.local
127.0.1.1 tj-api-v1.cybafelo.local
127.0.1.1 tj-tools.cybafelo.local
127.0.1.1 tj-gate.cybafelo.local
127.0.1.1 tj-content.cybafelo.local
127.0.1.1 tj-asset.cybafelo.local
127.0.1.1 tj-port.cybafelo.local
127.0.1.1 tj-app.cybafelo.local
127.0.1.1 tj-api.cybafelo.local
127.0.1.1 tj-cdn.cybafelo.local
127.0.1.1 tj-mail.cybafelo.local
127.0.1.1 tj-cron.cybafelo.local
127.0.1.1 tj-preview.cybafelo.local
127.0.1.1 tj-release.cybafelo.local
127.0.1.1 tj-weltmeister.cybafelo.local
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
# The following lines are desirable for IPv6 capable hosts
::1 ip6-localhost ip6-loopback

26
nginx/3d-editor-v2.conf
View File

@ -1,26 +0,0 @@
server {
listen 80;
server_name 3d-editor-v2.cybafelo.local 3d-editor-v2-debug.cybafelo.local;
root /usr/share/cybafelo/3d-editor-v2;
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:3105;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;
}
}

26
nginx/3d-editor-v3.conf
View File

@ -1,26 +0,0 @@
server {
listen 80;
server_name 3d-editor-v3.cybafelo.local 3d-editor-v3-debug.cybafelo.local;
root /usr/share/cybafelo/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;
}
}

34
nginx/3d-editor.conf
View File

@ -1,34 +0,0 @@
#origin git@github.com:ToywheelDev/3d_editor.git
server {
listen 80;
server_name 3d-editor.cybafelo.local 3d-editor-debug.cybafelo.local;
root /usr/share/cybafelo/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;
}
}

28
nginx/3d-pong.conf
View File

@ -1,28 +0,0 @@
server {
listen 80;
server_name 3d-pong.cybafelo.local 3d-pong-debug.cybafelo.local;
root /usr/share/cybafelo/3d-pong;
#We start to pass everything to express, otherwise we end up with '/' location saying 403 Forbidden
#Static files delivered trough express.static()
location ~ {
add_header Access-Control-Allow-Origin $http_origin;
# WebSocket support
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
# Normal parameters
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;
proxy_redirect off;
}
}

27
nginx/3d-racing.conf
View File

@ -1,27 +0,0 @@
#origin https://github.com/ToywheelDev/3d-racing.git
server {
listen 80;
server_name 3d-racing.cybafelo.local 3d-racing-debug.cybafelo.local;
root /usr/share/cybafelo/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;
}
}

25
nginx/api-v1.6.conf
View File

@ -1,25 +0,0 @@
#origin git@github.com:ToywheelDev/GW_Config.git
server {
listen 80;
server_name api-v1.6.cybafelo.local api-v1.6-debug.cybafelo.local;
root /usr/share/cybafelo/api-v1.6;
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;
}
}

28
nginx/api-v2.conf
View File

@ -1,28 +0,0 @@
server {
listen 80;
server_name api-v2.cybafelo.local api-v2-debug.cybafelo.local;
root /usr/share/cybafelo/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';
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:3106;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;
}
}

21
nginx/api-v3.conf
View File

@ -1,21 +0,0 @@
server {
listen 80;
server_name api-v3.cybafelo.local api-v3-debug.cybafelo.local;
root /usr/share/cybafelo/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;
}
}

34
nginx/tools.conf
View File

@ -1,34 +0,0 @@
#origin git@github.com:ToywheelDev/tools.git
server {
listen 80;
server_name tools.cybafelo.local tools-debug.cybafelo.local;
root /usr/share/cybafelo/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:3109;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;
}
}

145
secure.js
View File

@ -24,103 +24,8 @@ var secure = {
debug: true,
ignoreTLS: true
},
<<<<<<< HEAD
mongodb: {
host: 'mongodb://127.0.0.1',
db: 'cybafelo',
port: 27017,
shardPort: 27018,
options: {
db: {
native_parser: true
},
server: {
poolSize: 5,
keepAlive: 120
},
user: '',
pass: '',
autoIndex: false
}
},
sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23'
},
editor_v2: {
port: 3105,
debugPort: 3205,
cluster: false
},
api_v2: {
port: 3106,
debugPort: 3206,
liveReloadPort: 3406,
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
}
},
mailer: {
host: 'localhost',
port: 9025,
secure: false,
debug: true,
ignoreTLS: true
},
sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23'
},
editor_v3: {
port: 3107,
debugPort: 3207,
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'
=======
sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23',
customCodePath: '/usr/share/cybafelo/custom-code'
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
},
tools: {
port: 3109,
@ -156,11 +61,7 @@ var secure = {
// host: "smtp.office365.com",
// port: 587,
// auth: {
<<<<<<< HEAD
// user: "admin@cybafelo.com",
=======
// user: "admin@cybafelo.local",
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
// pass: "Toypro42!"
// },
// secureConnection: false,
@ -169,13 +70,8 @@ var secure = {
// rejectUnauthorized: false
// },
// emails: {
<<<<<<< HEAD
// founder: "evgeni@cybafelo.com",
// support: "support@cybafelo.com"
=======
// founder: "evgeni@cybafelo.local",
// support: "support@cybafelo.local"
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
// }
// },
mailer: {
@ -187,47 +83,6 @@ var secure = {
},
sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23'
},
<<<<<<< HEAD
api_runtime: {
port: 3112,
debugPort: 3212,
liveReloadPort: 3412,
cors: true,
cluster: false,
auth: {
secret: "xDKsyQm2F52Y9hfqv7yG80tu1wv90zkH",
token_duration: 86400000,
api_key: "gw_rocks",
admin: {
email: "admin@cybafelo.com",
password: "gw_config_api_rocks"
}
},
db: {
type: "mysql",
host: "127.0.0.1",
port: 3306,
database: "gw_core",
user: "root",
password: "",
max_connections: 10
},
game_session_timeout: 180000
},
masker: {
auth_key: "gw_masker_rocks"
},
statistics: {
port: 3113,
debugPort: 3213,
liveReloadPort: 3413,
mongodb: {
host: 'mongodb://127.0.0.1',
db: 'statistic'
}
},
=======
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
port: {
port: 3114,
debugPort: 3214

16
start
View File

@ -1,18 +1,4 @@
#!/bin/bash
cd /usr/share/cybafelo
<<<<<<< HEAD
./start_editor_v1
./start_editor_v2
./start_editor_v3
./start_pong
./start_racing
./start_tools
=======
#./start_editor
./start_api-v1.6
#./start_app
#./start_gate
#./start_port
#./start_mail
#./start_cron
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499

5
start_editor_v1
View File

@ -1,5 +0,0 @@
#!/bin/bash
cd /usr/share/cybafelo/api-v1.6
pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1.6
cd /usr/share/cybafelo/3d-editor
pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3203" --name 3d-editor

5
start_editor_v2
View File

@ -1,5 +0,0 @@
#!/bin/bash
cd /usr/share/cybafelo/api-v2
pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3206" --name api-v2
cd /usr/share/cybafelo/3d-editor-v2
pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3205" --name 3d-editor-v2

5
start_editor_v3
View File

@ -1,5 +0,0 @@
#!/bin/bash
cd /usr/share/cybafelo/api-v3
pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3208" --name api-v3
cd /usr/share/cybafelo/3d-editor-v3
pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3207" --name 3d-editor-v3

7
start_pong
View File

@ -1,5 +1,6 @@
#!/bin/bash
<<<<<<< HEAD
<<<<<<< HEAD
cd /usr/share/cybafelo/api-v1.6
pm2 start bin/start --node-args="--max-old-space-size=16000 --debug=3204" --name api-v1.6
cd /usr/share/cybafelo/3d-pong
@ -10,3 +11,9 @@ pm2 start bin/start --node-args="--max-old-space-size=16000 --inspect=3204" --na
cd /usr/share/cybafelo/3d-pong
pm2 start server.js --node-args="--max-old-space-size=16000 --inspect=3201" --name 3d-pong
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
=======
cd /usr/share/cybafelo/api-v1
pm2 start bin/start --node-args="--max-old-space-size=16000 --inspect=3204" --name api-v1
cd /usr/share/cybafelo/3d-pong
pm2 start server.js --node-args="--max-old-space-size=16000 --inspect=3201" --name 3d-pong
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499

4
start_racing
View File

@ -1,7 +1,11 @@
#!/usr/bin/env bash
#cd /usr/share/cybafelo/3d-racing-server
<<<<<<< HEAD
<<<<<<< HEAD
#pm2 start app.js --node-args="--max-old-space-size=16000 --debug=3202" --name 3d-racing-server
=======
#pm2 start app.js --node-args="--max-old-space-size=16000 --inspect=3202" --name 3d-racing-server
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
=======
#pm2 start app.js --node-args="--max-old-space-size=16000 --inspect=3202" --name 3d-racing-server
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499

4
start_tools
View File

@ -1,7 +1,11 @@
#!/usr/bin/env bash
cd /usr/share/cybafelo/tools
<<<<<<< HEAD
<<<<<<< HEAD
pm2 start server.js --node-args="--max-old-space-size=16000 --debug=3209" --name tools
=======
pm2 start server.js --node-args="--max-old-space-size=16000 --inspect=3209" --name tools
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
=======
pm2 start server.js --node-args="--max-old-space-size=16000 --inspect=3209" --name tools
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499

3
vimrc.local
View File

@ -30,10 +30,7 @@ set statusline="%f%m%r%h%w [%Y] [0x%02.2B]%< %F%=%4v,%4l %3p%% of %L"
set number
set nowrap
<<<<<<< HEAD
set history=1000000
=======
>>>>>>> 56f9a0e9c814bc05cdd17da606e11bf3f3485499
com! FormatJSON %!python -m json.tool
nmap <F5> dd\|i<C-R>=join([" -- Theunis J. Botha <tj.botha@plista.com> ", strftime("%a, %d %b %Y %H:%M:%S %z")], "")<CR><CR><Esc>
imap <F5> <ESC>dd\|i<C-R>=join([" -- Theunis J. Botha <tj.botha@plista.com> ", strftime("%a, %d %b %Y %H:%M:%S %z")], "")<CR><CR>