IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into bugfix/login

Browse Source
This commit is contained in:
Alexey Safronov 2022-11-17 19:05:09 +03:00
commit 7415a19a5e
7 changed files with 25 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/ASC.Socket.IO/config/index.js
View File

@ -17,25 +17,15 @@ function getAndSaveAppsettings(){
} }
var env = nconf.get("app").environment; var env = nconf.get("app").environment;
var valueEnv = nconf.get(env);
var fileWithEnv = path.join(appsettings, 'appsettings.' + valueEnv + '.json');
if(fs.existsSync(fileWithEnv)){ console.log('environment: ' + env);
nconf.file("appsettings", fileWithEnv); nconf.file("appsettingsWithEnv", path.join(appsettings, 'appsettings.' + env + '.json'));
}
else{
nconf.file("appsettings", path.join(appsettings, 'appsettings.json')); nconf.file("appsettings", path.join(appsettings, 'appsettings.json'));
}
nconf.file("appsettingsServices", path.join(appsettings, 'appsettings.services.json')); nconf.file("appsettingsServices", path.join(appsettings, 'appsettings.services.json'));
var redisWithEnv = path.join(appsettings, 'redis.' + valueEnv + '.json'); nconf.file("redisWithEnv", path.join(appsettings, 'redis.' + env + '.json'));
if(fs.existsSync(fileWithEnv)){ nconf.file("redis", path.join(appsettings, 'redis.json'));
nconf.file("redis", redisWithEnv);
}
else{
nconf.file("redis", path.join(__dirname, appsettings, 'redis.json'));
}
var redis = nconf.get("Redis"); var redis = nconf.get("Redis");
if(redis != null) if(redis != null)
@ -46,8 +36,4 @@ function getAndSaveAppsettings(){
redis.db = redis.Database; redis.db = redis.Database;
nconf.set("Redis", redis); nconf.set("Redis", redis);
} }
} }

11
common/ASC.SsoAuth/config/index.js
View File

@ -23,6 +23,8 @@ nconf.argv()
.env() .env()
.file("config",path.join(__dirname, "config.json")); .file("config",path.join(__dirname, "config.json"));
console.log("NODE_ENV: " + nconf.get("NODE_ENV"));
if (nconf.get("NODE_ENV") !== "development" && fs.existsSync(path.join(__dirname, nconf.get("NODE_ENV") + ".json"))) { if (nconf.get("NODE_ENV") !== "development" && fs.existsSync(path.join(__dirname, nconf.get("NODE_ENV") + ".json"))) {
nconf.file("config", path.join(__dirname, nconf.get("NODE_ENV") + ".json")); nconf.file("config", path.join(__dirname, nconf.get("NODE_ENV") + ".json"));
} }
@ -38,14 +40,9 @@ function getAndSaveAppsettings(){
appsettings =path.join(__dirname, appsettings); appsettings =path.join(__dirname, appsettings);
} }
var env = nconf.get("app").environment; var env = nconf.get("app").environment;
var valueEnv = nconf.get(env); console.log('environment: ' + env);
var fileWithEnv = path.join(appsettings, 'appsettings.' + valueEnv + '.json');
if(fs.existsSync(fileWithEnv)){ nconf.file("appsettingsWithEnv", path.join(appsettings, 'appsettings.' + env + '.json'));
nconf.file("appsettings", fileWithEnv);
}
else{
nconf.file("appsettings", path.join(appsettings, 'appsettings.json')); nconf.file("appsettings", path.join(appsettings, 'appsettings.json'));
}
nconf.file("appsettingsServices", path.join(appsettings, 'appsettings.services.json')); nconf.file("appsettingsServices", path.join(appsettings, 'appsettings.services.json'));
} }

9
common/ASC.UrlShortener/config/index.js
View File

@ -45,15 +45,10 @@ function getAndSaveAppsettings(){
} }
var env = nconf.get("app").environment; var env = nconf.get("app").environment;
var valueEnv = nconf.get(env); console.log('environment: ' + env);
var fileWithEnv = path.join(appsettings, 'appsettings.' + valueEnv + '.json');
if(fs.existsSync(fileWithEnv)){ nconf.file("appsettingsWithEnv", path.join(appsettings, 'appsettings.' + env + '.json'));
nconf.file("appsettings", fileWithEnv);
}
else{
nconf.file("appsettings", path.join(appsettings, 'appsettings.json')); nconf.file("appsettings", path.join(appsettings, 'appsettings.json'));
}
nconf.file("appsettingsServices", path.join(appsettings, 'appsettings.services.json')); nconf.file("appsettingsServices", path.join(appsettings, 'appsettings.services.json'));
} }

13
common/ASC.WebPlugins/config/index.ts
View File

@ -18,16 +18,9 @@ function getAndSaveAppsettings() {
} }
var env = nconf.get("app").environment; var env = nconf.get("app").environment;
console.log('environment: ' + env);
var valueEnv = nconf.get(env); nconf.file("appsettingsWithEnv", path.join(appsettings, 'appsettings.' + env + '.json'));
nconf.file("appsettings", path.join(appsettings, 'appsettings.json'));
var fileWithEnv = path.join(appsettings, "appsettings." + valueEnv + ".json");
if (fs.existsSync(fileWithEnv)) {
nconf.file("appsettings", fileWithEnv);
} else {
nconf.file("appsettings", path.join(appsettings, "appsettings.json"));
}
nconf.file("pluginsConf", path.join(appsettings, "plugins.json")); nconf.file("pluginsConf", path.join(appsettings, "plugins.json"));
} }

14
config/redis.test.json
View File

@ -1,14 +0,0 @@
{
"Redis": {
"Ssl": false,
"ConnectTimeout": 5000,
"SyncTimeout": 60000,
"ConnectRetry": 2,
"Database": 0,
"Hosts": [
{
"Host": "127.0.0.1",
"Port": "6379"
}]
}
}

13
packages/editor/src/server/config/index.js
View File

@ -14,17 +14,10 @@ function getAndSaveAppsettings() {
} }
const env = nconf.get("app").environment; const env = nconf.get("app").environment;
const valueEnv = nconf.get(env);
const fileWithEnv = path.join(
appsettings,
"appsettings." + valueEnv + ".json"
);
if (fs.existsSync(fileWithEnv)) { console.log('environment: ' + env);
nconf.file("appsettings", fileWithEnv); nconf.file("appsettingsWithEnv", path.join(appsettings, 'appsettings.' + env + '.json'));
} else { nconf.file("appsettings", path.join(appsettings, 'appsettings.json'));
nconf.file("appsettings", path.join(appsettings, "appsettings.json"));
}
nconf.file( nconf.file(
"appsettingsServices", "appsettingsServices",

15
packages/login/src/server/config/index.ts
View File

@ -14,18 +14,9 @@ function getAndSaveAppsettings() {
} }
const env: string = nconf.get("app").environment; const env: string = nconf.get("app").environment;
console.log('environment: ' + env);
const valueEnv: string = nconf.get(env); nconf.file("appsettingsWithEnv", path.join(appsettings, 'appsettings.' + env + '.json'));
const fileWithEnv = path.join( nconf.file("appsettings", path.join(appsettings, 'appsettings.json'));
appsettings,
"appsettings." + valueEnv + ".json"
);
if (fs.existsSync(fileWithEnv)) {
nconf.file("appsettings", fileWithEnv);
} else {
nconf.file("appsettings", path.join(appsettings, "appsettings.json"));
}
nconf.file( nconf.file(
"appsettingsServices", "appsettingsServices",