Merge pull request #625 from krallin/aws-calling-format

Config template: add boto_calling_format S3 option

Author: dmp42

README.md

@@ -298,7 +298,7 @@ AWS Simple Storage Service options
 1. `boto_host`: string, host for *non*-Amazon S3-compliant object store
 1. `boto_port`: for *non*-Amazon S3-compliant object store
 1. `boto_debug`: for *non*-Amazon S3-compliant object store
-1. `boto_calling_format`: for *non*-Amazon S3-compliant object store
+1. `boto_calling_format`: string, the fully qualified class name of the boto calling format to use when accessing S3 or a *non*-Amazon S3-compliant object store
 1. `storage_path`: string, the sub "folder" where image data will be stored.
 
 Example:

config/config_sample.yml

@@ -87,6 +87,7 @@ s3: &s3
     s3_secret_key: _env:AWS_SECRET
     boto_host: _env:AWS_HOST
     boto_port: _env:AWS_PORT
+    boto_calling_format: _env:AWS_CALLING_FORMAT
 
 # Ceph Object Gateway Configuration
 # See http://ceph.com/docs/master/radosgw/ for details on installing this service.