Просмотр исходного кода

Merge pull request #6278 from weseek/imprv/corrected-to-weseek-style

imprv: Corrected to WESEEK style
Yuki Takei 3 лет назад
Родитель
Сommit
dcaf8d175d

+ 1 - 1
packages/app/src/server/crowi/express-init.js

@@ -59,7 +59,7 @@ module.exports = function(crowi, app) {
 
   const { configManager } = crowi;
   const trustedProxies = configManager.getConfig('crowi', 'security:trustedProxies');
-  if (trustedProxies !== '') {
+  if (trustedProxies != null) {
     app.set('trust proxy', trustedProxies);
   }
 

+ 1 - 1
packages/app/src/server/service/config-loader.ts

@@ -368,7 +368,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     ns:      'crowi',
     key:     'security:trustedProxies',
     type:    ValueType.STRING,
-    default: '',
+    default: null,
   },
   LOCAL_STRATEGY_ENABLED: {
     ns:      'crowi',