diff --git a/doc/saio/swift/proxy-server.conf b/doc/saio/swift/proxy-server.conf index c656e3aeab..9352561406 100644 --- a/doc/saio/swift/proxy-server.conf +++ b/doc/saio/swift/proxy-server.conf @@ -39,13 +39,6 @@ use = egg:swift#slo use = egg:swift#container_sync current = //saio/saio_endpoint -[filter:s3api] -use = egg:swift#s3api -# Add this filter to your pipeline if you want to test with the S3 protocol. -s3_acl = yes -dns_compliant_bucket_names = no -check_bucket_owner = yes - [filter:tempurl] use = egg:swift#tempurl @@ -88,6 +81,9 @@ use = egg:swift#symlink # To enable, add the s3api middleware to the pipeline before tempauth [filter:s3api] use = egg:swift#s3api +s3_acl = yes +dns_compliant_bucket_names = no +check_bucket_owner = yes # Example to create root secret: `openssl rand -base64 32` [filter:keymaster] diff --git a/docker/rootfs/etc/swift/proxy-server.conf b/docker/rootfs/etc/swift/proxy-server.conf index 56eb8b0b23..0e7caf7b03 100644 --- a/docker/rootfs/etc/swift/proxy-server.conf +++ b/docker/rootfs/etc/swift/proxy-server.conf @@ -9,7 +9,7 @@ log_name = proxy-server user = swift [pipeline:main] -pipeline = catch_errors gatekeeper healthcheck proxy-logging cache listing_formats bulk tempurl ratelimit tempauth staticweb copy container-quotas account-quotas slo dlo versioned_writes symlink proxy-logging proxy-server +pipeline = catch_errors gatekeeper healthcheck proxy-logging cache listing_formats bulk tempurl ratelimit s3api tempauth staticweb copy container-quotas account-quotas slo dlo versioned_writes symlink proxy-logging proxy-server [filter:catch_errors] use = egg:swift#catch_errors @@ -35,17 +35,6 @@ use = egg:swift#dlo [filter:slo] use = egg:swift#slo -[filter:container_sync] -use = egg:swift#container_sync -current = //saio/saio_endpoint - -[filter:s3api] -use = egg:swift#s3api -# Add this filter to your pipeline if you want to test with the S3 protocol. -s3_acl = yes -dns_compliant_bucket_names = no -check_bucket_owner = yes - [filter:tempurl] use = egg:swift#tempurl