diff --git a/bash_history b/bash_history index 70cac7e..4026990 100644 --- a/bash_history +++ b/bash_history @@ -2267,3 +2267,4 @@ rm default sudo rm default sudo ln -s ../sites-available/cybafelo.conf sudo service nginx restart +exit diff --git a/config.js b/config.js index ccfd0ff..c67567a 100644 --- a/config.js +++ b/config.js @@ -1,6 +1,6 @@ var environment = { path : '/usr/share/cybafelo', - protocol : 'http', + protocol : 'https', environment : 'tj', domain : 'cybafelo.com' }; @@ -32,7 +32,7 @@ var config = { tools: { url: protocol + '://' + user + '-tools.' + domain, default: { - platform: 'gamewheel', + platform: 'cybafelo', account: 'root', subAccount: 'root' } @@ -66,7 +66,8 @@ var config = { }, environment: { mode: 'development' - } + }, + db: {} }; if (typeof module !== 'undefined') { diff --git a/model.js b/model.js index 1b5c2d2..eef2b11 100644 --- a/model.js +++ b/model.js @@ -3,10 +3,12 @@ var config = { connection: { // // default model connection - default : 'connect/connect.mongoose', - ticket : 'connect/connect.memcached', - gamestate : 'connect/connect.memcached', - job : 'connect/connect.memory' + default : 'connect/connect.mongoose.general', + ticket : 'connect/connect.memcached', + gamestate : 'connect/connect.memcached', + job : 'connect/connect.memory', + // event : 'connect/connect.mongoose.statistics', + content_state : 'connect/connect.mongoose.statistics' }, schema: { // diff --git a/nginx/sites-available/cybafelo.conf b/nginx/sites-available/cybafelo.conf index 9c8641f..d0491ac 100644 --- a/nginx/sites-available/cybafelo.conf +++ b/nginx/sites-available/cybafelo.conf @@ -1,5 +1,6 @@ server { listen 80 default_server; + listen [::]:80 default_server ipv6only=on; server_name ~^(?.*?)-(?.*?)\.(?.*); diff --git a/secure.js b/secure.js index d829342..a3eb7c2 100644 --- a/secure.js +++ b/secure.js @@ -24,24 +24,6 @@ var secure = { debug: true, ignoreTLS: true }, - 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' }, tools: { @@ -73,28 +55,27 @@ var secure = { port: 3111, debugPort: 3211, liveReloadPort: 3411, - mongodb: { - host: 'mongodb://127.0.0.1', - db: 'releaseTJ', - port: 27017, - shardPort: 27018, - options: { - db: { - native_parser: true - }, - server: { - poolSize: 5, - keepAlive: 120 - }, - user: '', - pass: '', - autoIndex: false - } - }, uploadPath : 'uploads', + // mailer: { + // host: "smtp.office365.com", + // port: 587, + // auth: { + // user: "admin@cybafelo.com", + // pass: "Toypro42!" + // }, + // secureConnection: false, + // tls: { + // ciphers: "SSLv3", + // rejectUnauthorized: false + // }, + // emails: { + // founder: "evgeni@cybafelo.com", + // support: "support@cybafelo.com" + // } + // }, mailer: { host: 'localhost', - port: 9025, + port: 25, secure: false, debug: true, ignoreTLS: true @@ -115,7 +96,6 @@ var secure = { apiUser : 'tj@cybafelo.com', apiPassword : 'test12345' }, - // database db : { mongo : { analytics : { @@ -135,6 +115,60 @@ var secure = { pass: '', autoIndex: false } + }, + statistics : { + host: 'mongodb://127.0.0.1', + db: 'statistic' + }, + general : { + host: 'mongodb://127.0.0.1', + db: 'releaseTJ', + port: 27017, + shardPort: 27018, + options: { + db: { + native_parser: true + }, + server: { + poolSize: 5, + keepAlive: 120 + }, + user: '', + pass: '', + autoIndex: false + } + }, + original : { + 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 + } + } + }, + mysql : { + statistics : { + host : '127.0.0.1', + user : 'root', + password : '', + database : 'gw_core' + } + }, + memcached : { + statistics : { + host : '127.0.0.1', + port : 11211 } } } diff --git a/start_api-v1.6 b/start_api-v1.6 new file mode 100755 index 0000000..cdec065 --- /dev/null +++ b/start_api-v1.6 @@ -0,0 +1,3 @@ +#!/bin/bash +cd /usr/share/cybafelo/api-v1 +pm2 start bin/start --node-args="--debug=3204" --name "api-v1.6"