From 0887f0985b109746953dcf42cfca4c9f5c102834 Mon Sep 17 00:00:00 2001 From: Thiago da Silva Date: Fri, 27 Jul 2018 17:28:03 -0400 Subject: [PATCH] Update saio sample config files Added healthcheck middleware to account, container, object servers Added the s3api, keymaster, encryption config to the proxy config file to make it easy to enable it. Change-Id: I96f120c5bc416e9aba388cbfa6c30b648d6ade2f --- doc/saio/swift/account-server/1.conf | 5 ++++- doc/saio/swift/account-server/2.conf | 5 ++++- doc/saio/swift/account-server/3.conf | 5 ++++- doc/saio/swift/account-server/4.conf | 5 ++++- doc/saio/swift/container-server/1.conf | 5 ++++- doc/saio/swift/container-server/2.conf | 5 ++++- doc/saio/swift/container-server/3.conf | 5 ++++- doc/saio/swift/container-server/4.conf | 5 ++++- doc/saio/swift/object-server/1.conf | 5 ++++- doc/saio/swift/object-server/2.conf | 5 ++++- doc/saio/swift/object-server/3.conf | 5 ++++- doc/saio/swift/object-server/4.conf | 5 ++++- doc/saio/swift/proxy-server.conf | 14 ++++++++++++++ 13 files changed, 62 insertions(+), 12 deletions(-) diff --git a/doc/saio/swift/account-server/1.conf b/doc/saio/swift/account-server/1.conf index 91ded8905d..4bdc05ed6b 100644 --- a/doc/saio/swift/account-server/1.conf +++ b/doc/saio/swift/account-server/1.conf @@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift eventlet_debug = true [pipeline:main] -pipeline = recon account-server +pipeline = healthcheck recon account-server [app:account-server] use = egg:swift#account @@ -19,6 +19,9 @@ use = egg:swift#account [filter:recon] use = egg:swift#recon +[filter:healthcheck] +use = egg:swift#healthcheck + [account-replicator] rsync_module = {replication_ip}::account{replication_port} diff --git a/doc/saio/swift/account-server/2.conf b/doc/saio/swift/account-server/2.conf index 37cae43dfc..087b7fb7a8 100644 --- a/doc/saio/swift/account-server/2.conf +++ b/doc/saio/swift/account-server/2.conf @@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift2 eventlet_debug = true [pipeline:main] -pipeline = recon account-server +pipeline = healthcheck recon account-server [app:account-server] use = egg:swift#account @@ -19,6 +19,9 @@ use = egg:swift#account [filter:recon] use = egg:swift#recon +[filter:healthcheck] +use = egg:swift#healthcheck + [account-replicator] rsync_module = {replication_ip}::account{replication_port} diff --git a/doc/saio/swift/account-server/3.conf b/doc/saio/swift/account-server/3.conf index 8931672eae..678209abc7 100644 --- a/doc/saio/swift/account-server/3.conf +++ b/doc/saio/swift/account-server/3.conf @@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift3 eventlet_debug = true [pipeline:main] -pipeline = recon account-server +pipeline = healthcheck recon account-server [app:account-server] use = egg:swift#account @@ -19,6 +19,9 @@ use = egg:swift#account [filter:recon] use = egg:swift#recon +[filter:healthcheck] +use = egg:swift#healthcheck + [account-replicator] rsync_module = {replication_ip}::account{replication_port} diff --git a/doc/saio/swift/account-server/4.conf b/doc/saio/swift/account-server/4.conf index 343bc43e6e..b14c4f81a0 100644 --- a/doc/saio/swift/account-server/4.conf +++ b/doc/saio/swift/account-server/4.conf @@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift4 eventlet_debug = true [pipeline:main] -pipeline = recon account-server +pipeline = healthcheck recon account-server [app:account-server] use = egg:swift#account @@ -19,6 +19,9 @@ use = egg:swift#account [filter:recon] use = egg:swift#recon +[filter:healthcheck] +use = egg:swift#healthcheck + [account-replicator] rsync_module = {replication_ip}::account{replication_port} diff --git a/doc/saio/swift/container-server/1.conf b/doc/saio/swift/container-server/1.conf index e71a5b6683..072594c92e 100644 --- a/doc/saio/swift/container-server/1.conf +++ b/doc/saio/swift/container-server/1.conf @@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift eventlet_debug = true [pipeline:main] -pipeline = recon container-server +pipeline = healthcheck recon container-server [app:container-server] use = egg:swift#container @@ -19,6 +19,9 @@ use = egg:swift#container [filter:recon] use = egg:swift#recon +[filter:healthcheck] +use = egg:swift#healthcheck + [container-replicator] rsync_module = {replication_ip}::container{replication_port} diff --git a/doc/saio/swift/container-server/2.conf b/doc/saio/swift/container-server/2.conf index 86e58a9fde..78c3d206b3 100644 --- a/doc/saio/swift/container-server/2.conf +++ b/doc/saio/swift/container-server/2.conf @@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift2 eventlet_debug = true [pipeline:main] -pipeline = recon container-server +pipeline = healthcheck recon container-server [app:container-server] use = egg:swift#container @@ -19,6 +19,9 @@ use = egg:swift#container [filter:recon] use = egg:swift#recon +[filter:healthcheck] +use = egg:swift#healthcheck + [container-replicator] rsync_module = {replication_ip}::container{replication_port} diff --git a/doc/saio/swift/container-server/3.conf b/doc/saio/swift/container-server/3.conf index 73e760af15..d4de73a927 100644 --- a/doc/saio/swift/container-server/3.conf +++ b/doc/saio/swift/container-server/3.conf @@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift3 eventlet_debug = true [pipeline:main] -pipeline = recon container-server +pipeline = healthcheck recon container-server [app:container-server] use = egg:swift#container @@ -19,6 +19,9 @@ use = egg:swift#container [filter:recon] use = egg:swift#recon +[filter:healthcheck] +use = egg:swift#healthcheck + [container-replicator] rsync_module = {replication_ip}::container{replication_port} diff --git a/doc/saio/swift/container-server/4.conf b/doc/saio/swift/container-server/4.conf index c254191b8f..d644ff29e7 100644 --- a/doc/saio/swift/container-server/4.conf +++ b/doc/saio/swift/container-server/4.conf @@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift4 eventlet_debug = true [pipeline:main] -pipeline = recon container-server +pipeline = healthcheck recon container-server [app:container-server] use = egg:swift#container @@ -19,6 +19,9 @@ use = egg:swift#container [filter:recon] use = egg:swift#recon +[filter:healthcheck] +use = egg:swift#healthcheck + [container-replicator] rsync_module = {replication_ip}::container{replication_port} diff --git a/doc/saio/swift/object-server/1.conf b/doc/saio/swift/object-server/1.conf index c6d1b1464f..2437223944 100644 --- a/doc/saio/swift/object-server/1.conf +++ b/doc/saio/swift/object-server/1.conf @@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift eventlet_debug = true [pipeline:main] -pipeline = recon object-server +pipeline = healthcheck recon object-server [app:object-server] use = egg:swift#object @@ -19,6 +19,9 @@ use = egg:swift#object [filter:recon] use = egg:swift#recon +[filter:healthcheck] +use = egg:swift#healthcheck + [object-replicator] rsync_module = {replication_ip}::object{replication_port} diff --git a/doc/saio/swift/object-server/2.conf b/doc/saio/swift/object-server/2.conf index 8d99b02871..647afda415 100644 --- a/doc/saio/swift/object-server/2.conf +++ b/doc/saio/swift/object-server/2.conf @@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift2 eventlet_debug = true [pipeline:main] -pipeline = recon object-server +pipeline = healthcheck recon object-server [app:object-server] use = egg:swift#object @@ -19,6 +19,9 @@ use = egg:swift#object [filter:recon] use = egg:swift#recon +[filter:healthcheck] +use = egg:swift#healthcheck + [object-replicator] rsync_module = {replication_ip}::object{replication_port} diff --git a/doc/saio/swift/object-server/3.conf b/doc/saio/swift/object-server/3.conf index fe6cef65a0..5630257619 100644 --- a/doc/saio/swift/object-server/3.conf +++ b/doc/saio/swift/object-server/3.conf @@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift3 eventlet_debug = true [pipeline:main] -pipeline = recon object-server +pipeline = healthcheck recon object-server [app:object-server] use = egg:swift#object @@ -19,6 +19,9 @@ use = egg:swift#object [filter:recon] use = egg:swift#recon +[filter:healthcheck] +use = egg:swift#healthcheck + [object-replicator] rsync_module = {replication_ip}::object{replication_port} diff --git a/doc/saio/swift/object-server/4.conf b/doc/saio/swift/object-server/4.conf index 86ba2621ed..0ab17690df 100644 --- a/doc/saio/swift/object-server/4.conf +++ b/doc/saio/swift/object-server/4.conf @@ -11,7 +11,7 @@ recon_cache_path = /var/cache/swift4 eventlet_debug = true [pipeline:main] -pipeline = recon object-server +pipeline = healthcheck recon object-server [app:object-server] use = egg:swift#object @@ -19,6 +19,9 @@ use = egg:swift#object [filter:recon] use = egg:swift#recon +[filter:healthcheck] +use = egg:swift#healthcheck + [object-replicator] rsync_module = {replication_ip}::object{replication_port} diff --git a/doc/saio/swift/proxy-server.conf b/doc/saio/swift/proxy-server.conf index 869eff871d..5dcf1e4eb3 100644 --- a/doc/saio/swift/proxy-server.conf +++ b/doc/saio/swift/proxy-server.conf @@ -77,6 +77,20 @@ use = egg:swift#listing_formats [filter:symlink] use = egg:swift#symlink +# To enable, add the s3api middleware to the pipeline before tempauth +[filter:s3api] +use = egg:swift#s3api + +# Example to create root secret: `openssl rand -base64 32` +[filter:keymaster] +use = egg:swift#keymaster +encryption_root_secret = changeme/changeme/changeme/changeme/change/= + +# To enable use of encryption add both middlewares to pipeline, example: +# keymaster encryption proxy-logging proxy-server +[filter:encryption] +use = egg:swift#encryption + [app:proxy-server] use = egg:swift#proxy allow_account_management = true