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

fix nconf

Browse Source
This commit is contained in:
Anton Suhorukov 2022-11-17 14:56:04 +03:00
parent d39666df9d
commit bf89726fbc
4 changed files with 18 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -22,6 +22,8 @@ const nconf = require("nconf"),
nconf.argv()
.env()
.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"))) {
nconf.file("config", path.join(__dirname, nconf.get("NODE_ENV") + ".json"));
@ -38,14 +40,9 @@ function getAndSaveAppsettings(){
appsettings =path.join(__dirname, appsettings);
}
var env = nconf.get("app").environment;
var valueEnv = nconf.get(env);
var fileWithEnv = path.join(appsettings, 'appsettings.' + valueEnv + '.json');
console.log('environment: ' + env);
if(fs.existsSync(fileWithEnv)){
nconf.file("appsettings", fileWithEnv);
}
else{
nconf.file("appsettings", path.join(appsettings, 'appsettings.json'));
}
nconf.file("appsettingsWithEnv", path.join(appsettings, 'appsettings.' + env + '.json'));
nconf.file("appsettings", path.join(appsettings, 'appsettings.json'));
nconf.file("appsettingsServices", path.join(appsettings, 'appsettings.services.json'));
}

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

@ -45,15 +45,10 @@ function getAndSaveAppsettings(){
}
var env = nconf.get("app").environment;
var valueEnv = nconf.get(env);
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'));
}
console.log('environment: ' + env);
nconf.file("appsettingsWithEnv", path.join(appsettings, 'appsettings.' + env + '.json'));
nconf.file("appsettings", path.join(appsettings, 'appsettings.json'));
nconf.file("appsettingsServices", path.join(appsettings, 'appsettings.services.json'));
}

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

@ -18,16 +18,9 @@ function getAndSaveAppsettings() {
}
var env = nconf.get("app").environment;
var valueEnv = nconf.get(env);
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"));
}
console.log('environment: ' + env);
nconf.file("appsettingsWithEnv", path.join(appsettings, 'appsettings.' + env + '.json'));
nconf.file("appsettings", path.join(appsettings, 'appsettings.json'));
nconf.file("pluginsConf", path.join(appsettings, "plugins.json"));
}