Add support for AWS cn (#4327)

This commit is contained in:
Hu Ming
2016-07-14 22:56:09 +08:00
committed by Régis Hanol
parent e5bbfe1f1b
commit f8a12d4940
6 changed files with 11 additions and 2 deletions

View File

@@ -62,6 +62,8 @@ module FileStore
# cf. http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
@absolute_base_url ||= if SiteSetting.s3_region == "us-east-1"
"//#{s3_bucket}.s3.amazonaws.com"
elsif SiteSetting.s3_region == 'cn-north-1'
"//#{s3_bucket}.s3.cn-north-1.amazonaws.com.cn"
else
"//#{s3_bucket}.s3-#{SiteSetting.s3_region}.amazonaws.com"
end