From 055d07380347cec2bff14383ed1434852f91336e Mon Sep 17 00:00:00 2001 From: Chmouel Boudjnah Date: Tue, 3 Apr 2012 21:06:02 +0200 Subject: Update swift_auth documentation. - Make it consistent between the source documentation and the rst documentation. - Note about the default being https. Change-Id: Ic78ef79198eee9b514bb52fce12d7224e9ab65ae --- doc/source/configuringservices.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'doc/source') diff --git a/doc/source/configuringservices.rst b/doc/source/configuringservices.rst index 04f068cc..05fe12f1 100644 --- a/doc/source/configuringservices.rst +++ b/doc/source/configuringservices.rst @@ -237,7 +237,7 @@ rather than its built in 'tempauth'. Configuring Swift with S3 emulation to use Keystone --------------------------------------------------- -Keystone support validating S3 tokens using the same tokens as the +Keystone supports validating S3 tokens using the same tokens as the generated EC2 tokens. When you have generated a pair of EC2 access token and secret you can access your swift cluster directly with the S3 api. @@ -246,7 +246,7 @@ S3 api. (`/etc/swift/swift-proxy.conf` to use S3token and Swift3 middleware. - Here's an example:: + Here's an example that by default communicates with keystone via https :: [DEFAULT] bind_port = 8080 @@ -277,15 +277,17 @@ S3 api. [filter:s3token] paste.filter_factory = keystone.middleware.s3_token:filter_factory + # uncomment the following line if you don't want to use SSL + # auth_protocol = http auth_port = 35357 auth_host = 127.0.0.1 - auth_protocol = http [filter:authtoken] paste.filter_factory = keystone.middleware.auth_token:filter_factory + # uncomment the following line if you don't want to use SSL + # auth_protocol = http auth_port = 35357 auth_host = 127.0.0.1 - auth_protocol = http auth_token = ADMIN admin_token = ADMIN -- cgit