move to build structure
parent
70d7365a71
commit
a2be6c6246
|
@ -1,10 +1,10 @@
|
|||
var environment = {
|
||||
path : '/usr/share/fs',
|
||||
path : '/usr/share/r3-server',
|
||||
protocol : 'https',
|
||||
websocketProtocol : 'wss',
|
||||
websocketApp : 'beta-websocket',
|
||||
domain : 'flyingspoon.de',
|
||||
remoteDomain : 'cybafelo.com'
|
||||
websocketApp : 'beta.websocket',
|
||||
domain : 'r3js.org',
|
||||
remoteDomain : 'flyingspoon.de'
|
||||
};
|
||||
|
||||
var protocol = environment.protocol;
|
||||
|
@ -15,15 +15,15 @@ var websocketApp = environment.websocketApp;
|
|||
|
||||
var config = {
|
||||
editor: {
|
||||
url: protocol + '://beta-editor.' + domain,
|
||||
url: protocol + '://beta.editor.' + domain,
|
||||
default: {
|
||||
platform: 'flyingspoon',
|
||||
platform: 'r3js',
|
||||
project: 'Project X'
|
||||
}
|
||||
},
|
||||
api: {
|
||||
url: protocol + '://beta-r3-api.' + domain,
|
||||
remoteUrl: protocol + '://beta-r3-api.' + remoteDomain,
|
||||
url: protocol + '://beta.api.' + domain,
|
||||
remoteUrl: protocol + '://beta.api.' + remoteDomain,
|
||||
uploadPath: '/uploads',
|
||||
clientPassword: '"kent sent me" motherfucker!'
|
||||
},
|
||||
|
@ -35,7 +35,7 @@ var config = {
|
|||
url : websocketProtocol + '://' + websocketApp + '.' + domain
|
||||
},
|
||||
portal: {
|
||||
url: protocol + '://beta-portal.' + domain
|
||||
url: protocol + '://beta.portal.' + domain
|
||||
},
|
||||
db: {},
|
||||
environment : environment
|
||||
|
|
|
@ -2145,9 +2145,9 @@
|
|||
}
|
||||
},
|
||||
"lodash": {
|
||||
"version": "4.17.5",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
|
||||
"integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw=="
|
||||
"version": "4.17.15",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
|
||||
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
|
||||
},
|
||||
"make-iterator": {
|
||||
"version": "1.0.1",
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
"repository": "https://bitbucket.org/cybafelo/r3-config/src/master/",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"lodash": "^4.16.6"
|
||||
"lodash": "^4.17.15"
|
||||
},
|
||||
"devDependencies": {
|
||||
"gulp": "^4.0.2"
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
var environment = {
|
||||
path : '/usr/share/fs',
|
||||
path : '/usr/share/r3-server',
|
||||
protocol : 'https',
|
||||
websocketProtocol : 'wss',
|
||||
websocketApp : 'beta-websocket',
|
||||
domain : 'flyingspoon.de',
|
||||
remoteDomain : 'cybafelo.com'
|
||||
websocketApp : 'beta.websocket',
|
||||
domain : 'r3js.org',
|
||||
remoteDomain : 'flyingspoon.de'
|
||||
};
|
||||
|
||||
var protocol = environment.protocol;
|
||||
|
@ -15,15 +15,15 @@ var websocketApp = environment.websocketApp;
|
|||
|
||||
var config = {
|
||||
editor: {
|
||||
url: protocol + '://beta-editor.' + domain,
|
||||
url: protocol + '://beta.editor.' + domain,
|
||||
default: {
|
||||
platform: 'flyingspoon',
|
||||
platform: 'r3js',
|
||||
project: 'Project X'
|
||||
}
|
||||
},
|
||||
api: {
|
||||
url: protocol + '://beta-r3-api.' + domain,
|
||||
remoteUrl: protocol + '://beta-r3-api.' + remoteDomain,
|
||||
url: protocol + '://beta.api.' + domain,
|
||||
remoteUrl: protocol + '://beta.api.' + remoteDomain,
|
||||
uploadPath: '/uploads',
|
||||
clientPassword: '"kent sent me" motherfucker!'
|
||||
},
|
||||
|
@ -35,7 +35,7 @@ var config = {
|
|||
url : websocketProtocol + '://' + websocketApp + '.' + domain
|
||||
},
|
||||
portal: {
|
||||
url: protocol + '://beta-portal.' + domain
|
||||
url: protocol + '://beta.portal.' + domain
|
||||
},
|
||||
db: {},
|
||||
environment : environment
|
||||
|
|
|
@ -2,7 +2,7 @@ var secure = {
|
|||
api: {
|
||||
port: 3104,
|
||||
debugPort: 3204,
|
||||
customCodePath: '/usr/share/fs/beta/r3-custom-code',
|
||||
customCodePath: '/usr/share/r3-server/beta/r3-custom-code',
|
||||
serverPassword: '"kent sent me" motherfucker!'
|
||||
},
|
||||
websocket: {
|
||||
|
@ -13,7 +13,7 @@ var secure = {
|
|||
mongo : {
|
||||
original : {
|
||||
host: 'mongodb://127.0.0.1',
|
||||
db: 'fs',
|
||||
db: 'beta',
|
||||
port: 27017,
|
||||
shardPort: 27018,
|
||||
options: {
|
||||
|
|
Loading…
Reference in New Issue