summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHumble Devassy Chirammal <humble.devassy@gmail.com>2017-11-07 12:04:34 +0000
committerGitHub <noreply@github.com>2017-11-07 12:04:34 +0000
commitc1b18923604acad7456dbac367382c3fa2def29c (patch)
tree00660c3a141fac4778567d37a362587e15775158
parentcc7676d2ea937060fc93dffaf32e8b7045224db1 (diff)
parent946a7cae5473ddbbdb23279a83cb00e31d85129e (diff)
downloadgluster-c1b18923604acad7456dbac367382c3fa2def29c.tar.gz
gluster-c1b18923604acad7456dbac367382c3fa2def29c.tar.bz2
gluster-c1b18923604acad7456dbac367382c3fa2def29c.tar.xz
gluster-c1b18923604acad7456dbac367382c3fa2def29c.zip
Merge pull request #58 from SaravanaStorageNetwork/s3_acl_support
Turn on S3 ACL support
-rw-r--r--gluster-s3object/CentOS/docker-gluster-s3/Dockerfile2
-rw-r--r--gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf1
2 files changed, 2 insertions, 1 deletions
diff --git a/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile b/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile
index 66474e3..9c857f4 100644
--- a/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile
+++ b/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile
@@ -25,7 +25,7 @@ RUN yum -v --setopt=tsflags=nodocs -y update && \
epel-release && \
yum -v --setopt=tsflags=nodocs -y install \
openstack-swift openstack-swift-{proxy,account,container,object,plugin-swift3} \
- git memcached python-prettytable && \
+ git memcached python-prettytable python-setuptools && \
yum -y install systemd && \
(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
rm -f /lib/systemd/system/multi-user.target.wants/*;\
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 8e6ecc5..f999eaf 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
@@ -97,6 +97,7 @@ user_test5_tester5 = testing5 service
[filter:swift3]
use = egg:swift3#swift3
+s3_acl = true
[filter:gswauth]
use = egg:gluster_swift#gswauth