Browse Source

refs GW-232: GCS にアップロードできる
- 環境変数を configManager から取得

Otani Haruhiko 6 years ago
parent
commit
c314412501
2 changed files with 7 additions and 1 deletions
  1. 6 0
      src/server/service/config-loader.js
  2. 1 1
      src/server/service/file-uploader/gcp.js

+ 6 - 0
src/server/service/config-loader.js

@@ -220,6 +220,12 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     type:    TYPES.STRING,
     type:    TYPES.STRING,
     default: null,
     default: null,
   },
   },
+  GCS_BUCKET: {
+    ns:      'crowi',
+    key:     'gsc:bucket',
+    type:    TYPES.STRING,
+    default: null,
+  },
 };
 };
 
 
 class ConfigLoader {
 class ConfigLoader {

+ 1 - 1
src/server/service/file-uploader/gcp.js

@@ -10,7 +10,7 @@ module.exports = function(crowi) {
   const lib = new Uploader(configManager);
   const lib = new Uploader(configManager);
 
 
   function getGcsBucket() {
   function getGcsBucket() {
-    return process.env.GCS_BUCKET;
+    return configManager.getConfig('crowi', 'gsc:bucket');
   }
   }
 
 
   function GCSFactory(isUploadable) {
   function GCSFactory(isUploadable) {