diff --git a/common/ASC.Socket.IO/config/index.js b/common/ASC.Socket.IO/config/index.js index 8b57eaeebb..f8a83975cb 100644 --- a/common/ASC.Socket.IO/config/index.js +++ b/common/ASC.Socket.IO/config/index.js @@ -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); } - - - - } \ No newline at end of file diff --git a/common/ASC.SsoAuth/config/index.js b/common/ASC.SsoAuth/config/index.js index 4865550202..0a5372a44a 100644 --- a/common/ASC.SsoAuth/config/index.js +++ b/common/ASC.SsoAuth/config/index.js @@ -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')); } \ No newline at end of file diff --git a/common/ASC.UrlShortener/config/index.js b/common/ASC.UrlShortener/config/index.js index 0f2cb7ad49..52a336f002 100644 --- a/common/ASC.UrlShortener/config/index.js +++ b/common/ASC.UrlShortener/config/index.js @@ -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')); } diff --git a/common/ASC.WebPlugins/config/index.ts b/common/ASC.WebPlugins/config/index.ts index 04c3bde996..717142a267 100644 --- a/common/ASC.WebPlugins/config/index.ts +++ b/common/ASC.WebPlugins/config/index.ts @@ -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")); }