itizawa 6 yıl önce
ebeveyn
işleme
b28dddb5a7

+ 1 - 1
src/client/js/components/Admin/AdminHome/EnvVarsTable.jsx

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 const EnvVarsTable = (props) => {
 const EnvVarsTable = (props) => {
   const envVarRows = [];
   const envVarRows = [];
 
 
-  for (const [key, value] of Object.entries(props.envVars.crowi)) {
+  for (const [key, value] of Object.entries(props.envVars)) {
     if (value != null) {
     if (value != null) {
       envVarRows.push(
       envVarRows.push(
         <tr key={key}>
         <tr key={key}>

+ 1 - 4
src/server/service/config-loader.js

@@ -359,12 +359,9 @@ class ConfigLoader {
     const config = {};
     const config = {};
     for (const ENV_VAR_NAME of Object.keys(ENV_VAR_NAME_TO_CONFIG_INFO)) {
     for (const ENV_VAR_NAME of Object.keys(ENV_VAR_NAME_TO_CONFIG_INFO)) {
       const configInfo = ENV_VAR_NAME_TO_CONFIG_INFO[ENV_VAR_NAME];
       const configInfo = ENV_VAR_NAME_TO_CONFIG_INFO[ENV_VAR_NAME];
-      if (config[configInfo.ns] === undefined) {
-        config[configInfo.ns] = {};
-      }
 
 
       if (!isSecurityEnv(configInfo.key) && process.env[ENV_VAR_NAME] !== undefined) {
       if (!isSecurityEnv(configInfo.key) && process.env[ENV_VAR_NAME] !== undefined) {
-        config[configInfo.ns][ENV_VAR_NAME] = configInfo.type.parse(process.env[ENV_VAR_NAME]);
+        config[ENV_VAR_NAME] = configInfo.type.parse(process.env[ENV_VAR_NAME]);
       }
       }
     }
     }