summaryrefslogtreecommitdiffstats
path: root/gluster-s3object/CentOS/docker-gluster-s3/etc
diff options
context:
space:
mode:
authorHumble Devassy Chirammal <humble.devassy@gmail.com>2017-07-31 12:29:37 +0000
committerGitHub <noreply@github.com>2017-07-31 12:29:37 +0000
commite5da35f7f83b2be0b78aadc1056a5dd9d77f4835 (patch)
treea854f78176e4406ed65455e778059ce9a46dc0e3 /gluster-s3object/CentOS/docker-gluster-s3/etc
parent4757dd977452d15baae91d46a7895cd3d5b7863e (diff)
parentb214fff44235d8f011fcd9de12a9d2735deb50ee (diff)
downloadgluster-e5da35f7f83b2be0b78aadc1056a5dd9d77f4835.tar.gz
gluster-e5da35f7f83b2be0b78aadc1056a5dd9d77f4835.tar.bz2
gluster-e5da35f7f83b2be0b78aadc1056a5dd9d77f4835.tar.xz
gluster-e5da35f7f83b2be0b78aadc1056a5dd9d77f4835.zip
Merge pull request #50 from vredara/s3_auth_add_user
Added S3 authentication changes
Diffstat (limited to 'gluster-s3object/CentOS/docker-gluster-s3/etc')
-rw-r--r--gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf9
-rw-r--r--gluster-s3object/CentOS/docker-gluster-s3/etc/sysconfig/swift-volumes2
2 files changed, 10 insertions, 1 deletions
diff --git a/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf
index 979b735..8e6ecc5 100644
--- a/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf
+++ b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf
@@ -5,7 +5,7 @@ user = root
workers = 1
[pipeline:main]
-pipeline = catch_errors gatekeeper healthcheck proxy-logging cache bulk ratelimit swift3 staticweb slo dlo proxy-logging proxy-server
+pipeline = catch_errors gatekeeper healthcheck proxy-logging cache bulk ratelimit swift3 gswauth staticweb slo dlo proxy-logging proxy-server
[app:proxy-server]
use = egg:gluster_swift#proxy
@@ -97,3 +97,10 @@ user_test5_tester5 = testing5 service
[filter:swift3]
use = egg:swift3#swift3
+
+[filter:gswauth]
+use = egg:gluster_swift#gswauth
+set log_name = gswauth
+super_admin_key = gswauthkey
+metadata_volume = gsmetadata
+s3_support = on
diff --git a/gluster-s3object/CentOS/docker-gluster-s3/etc/sysconfig/swift-volumes b/gluster-s3object/CentOS/docker-gluster-s3/etc/sysconfig/swift-volumes
index 8b49f07..3aeb7ec 100644
--- a/gluster-s3object/CentOS/docker-gluster-s3/etc/sysconfig/swift-volumes
+++ b/gluster-s3object/CentOS/docker-gluster-s3/etc/sysconfig/swift-volumes
@@ -1,2 +1,4 @@
# Set Gluster volumes to be used by gluster-object service
GLUSTER_VOLUMES="tv1"
+GLUSTER_USER="admin"
+GLUSTER_PASSWORD="redhat"