From 7c9112fc3cdb237e45f17a6ca09ba2f9245a6806 Mon Sep 17 00:00:00 2001 From: Andrey Kostov Date: Wed, 7 Jan 2015 11:51:29 +0200 Subject: [PATCH] Make the encrpyt parameter default to false --- storagedriver/s3/README.md | 2 +- storagedriver/s3/s3.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storagedriver/s3/README.md b/storagedriver/s3/README.md index ac99d88d5..58f01da2c 100644 --- a/storagedriver/s3/README.md +++ b/storagedriver/s3/README.md @@ -15,7 +15,7 @@ An implementation of the `storagedriver.StorageDriver` interface which uses Amaz `bucket`: The name of your s3 bucket where you wish to store objects (needs to already be created prior to driver initialization). -`encrypt`: (optional) Whether you would like your data encrypted on the server side (defaults to true if not specified). +`encrypt`: (optional) Whether you would like your data encrypted on the server side (defaults to false if not specified). `secure`: (optional) Whether you would like to transfer data over ssl or not. Defaults to true (meaning transfering over ssl) if not specified. Note that while setting this to false will improve performance, it is not recommended due to security concerns. diff --git a/storagedriver/s3/s3.go b/storagedriver/s3/s3.go index a2a6758b1..3ef55ce18 100644 --- a/storagedriver/s3/s3.go +++ b/storagedriver/s3/s3.go @@ -87,7 +87,7 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) { return nil, fmt.Errorf("No bucket parameter provided") } - encryptBool := true + encryptBool := false encrypt, ok := parameters["encrypt"] if ok { encryptBool, ok = encrypt.(bool)