mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Merge pull request #3369 from fredjean/master
Only show HTTPS bucket name warning when not using path_style
This commit is contained in:
commit
770f165548
1 changed files with 5 additions and 5 deletions
|
@ -224,7 +224,7 @@ module Fog
|
||||||
if COMPLIANT_BUCKET_NAMES !~ bucket_name
|
if COMPLIANT_BUCKET_NAMES !~ bucket_name
|
||||||
Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) is not a valid dns name, which will negatively impact performance. For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
|
Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) is not a valid dns name, which will negatively impact performance. For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
|
||||||
path_style = true
|
path_style = true
|
||||||
elsif scheme == 'https' && bucket_name =~ /\./
|
elsif scheme == 'https' && !path_style && bucket_name =~ /\./
|
||||||
Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) contains a '.' so is not accessible over https as a virtual hosted bucket, which will negatively impact performance. For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
|
Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) contains a '.' so is not accessible over https as a virtual hosted bucket, which will negatively impact performance. For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
|
||||||
path_style = true
|
path_style = true
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue