diff --git a/deploy.env b/deploy.env index 701833d7..d6a6478f 100644 --- a/deploy.env +++ b/deploy.env @@ -48,7 +48,7 @@ USE_MINIO=true AWS_ACCESS_KEY_ID=minioadmin AWS_SECRET_ACCESS_KEY=minioadmin AWS_S3_BUCKET=appflowy -AWS_REGION=us-east-1 +#AWS_REGION=us-east-1 RUST_LOG=info diff --git a/dev.env b/dev.env index 145a4c28..6a55e76f 100644 --- a/dev.env +++ b/dev.env @@ -55,7 +55,7 @@ USE_MINIO=true AWS_ACCESS_KEY_ID=minioadmin AWS_SECRET_ACCESS_KEY=minioadmin AWS_S3_BUCKET=appflowy -AWS_REGION=us-east-1 +#AWS_REGION=us-east-1 RUST_LOG=info diff --git a/src/application.rs b/src/application.rs index 9c86e3bf..d31ed52b 100644 --- a/src/application.rs +++ b/src/application.rs @@ -294,7 +294,7 @@ async fn get_aws_s3_bucket(s3_setting: &S3Setting) -> Result let region = { match s3_setting.use_minio { true => s3::Region::Custom { - region: "".to_owned(), + region: s3_setting.region.to_owned(), endpoint: s3_setting.minio_url.to_owned(), }, false => s3_setting diff --git a/src/config/config.rs b/src/config/config.rs index f0009c9b..55fcdf25 100644 --- a/src/config/config.rs +++ b/src/config/config.rs @@ -116,7 +116,7 @@ pub fn get_configuration() -> Result { access_key: get_env_var("APPFLOWY_S3_ACCESS_KEY", "minioadmin"), secret_key: get_env_var("APPFLOWY_S3_SECRET_KEY", "minioadmin").into(), bucket: get_env_var("APPFLOWY_S3_BUCKET", "appflowy"), - region: get_env_var("APPFLOWY_S3_REGION", "us-east-1"), + region: get_env_var("APPFLOWY_S3_REGION", ""), }, casbin: CasbinSetting { pool_size: get_env_var("APPFLOWY_CASBIN_POOL_SIZE", "8").parse()?,