From 4c5f53d0d3723256633e858b838c14b46f43685e Mon Sep 17 00:00:00 2001 From: Guilherme Maluf Date: Thu, 23 Jul 2015 17:28:33 -0300 Subject: [PATCH] Add a blank line to the beginning of each filter Filters fragments leads to section headers and previous options with no blank line between them foo = bar [section] Add a blank line to the beginning of each filter so that when applied the resulting file is more human readable Change-Id: I411eba5da5fc4e1a7217df197edbaf5ef2d5e4fa --- templates/account-server.conf.erb | 2 -- templates/proxy/account_quotas.conf.erb | 1 - templates/proxy/authtoken.conf.erb | 1 + templates/proxy/bulk.conf.erb | 1 - templates/proxy/cache.conf.erb | 1 + templates/proxy/catch_errors.conf.erb | 2 +- templates/proxy/ceilometer.conf.erb | 2 +- templates/proxy/container_quotas.conf.erb | 1 - templates/proxy/crossdomain.conf.erb | 2 +- templates/proxy/formpost.conf.erb | 1 - templates/proxy/gatekeeper.conf.erb | 1 + templates/proxy/healthcheck.conf.erb | 1 - templates/proxy/proxy-logging.conf.erb | 2 +- templates/proxy/ratelimit.conf.erb | 2 +- templates/proxy/s3token.conf.erb | 1 + templates/proxy/slo.conf.erb | 1 + templates/proxy/staticweb.conf.erb | 1 - templates/proxy/swauth.conf.erb | 1 - templates/proxy/swift3.conf.erb | 2 +- templates/recon.conf.erb | 1 + 20 files changed, 12 insertions(+), 15 deletions(-) diff --git a/templates/account-server.conf.erb b/templates/account-server.conf.erb index f040fec8..7fd7094d 100644 --- a/templates/account-server.conf.erb +++ b/templates/account-server.conf.erb @@ -17,7 +17,6 @@ log_udp_host = <%= @log_udp_host -%> log_udp_port = <%= @log_udp_port -%> <% end %> - [pipeline:main] pipeline = <%= @pipeline.to_a.join(' ') %> @@ -29,7 +28,6 @@ set log_level = <%= @log_level %> set log_requests = True set log_address = <%= @log_address %> - [account-replicator] concurrency = <%= @replicator_concurrency %> diff --git a/templates/proxy/account_quotas.conf.erb b/templates/proxy/account_quotas.conf.erb index 14f32ae8..511a3100 100644 --- a/templates/proxy/account_quotas.conf.erb +++ b/templates/proxy/account_quotas.conf.erb @@ -1,4 +1,3 @@ [filter:account_quotas] use = egg:swift#account_quotas - diff --git a/templates/proxy/authtoken.conf.erb b/templates/proxy/authtoken.conf.erb index b66c24b5..e7553bb2 100644 --- a/templates/proxy/authtoken.conf.erb +++ b/templates/proxy/authtoken.conf.erb @@ -1,3 +1,4 @@ + [filter:authtoken] log_name = swift signing_dir = <%= @signing_dir %> diff --git a/templates/proxy/bulk.conf.erb b/templates/proxy/bulk.conf.erb index 3c168eec..19e02c2e 100644 --- a/templates/proxy/bulk.conf.erb +++ b/templates/proxy/bulk.conf.erb @@ -5,4 +5,3 @@ max_containers_per_extraction = <%= @max_containers_per_extraction %> max_failed_extractions = <%= @max_failed_extractions %> max_deletes_per_request = <%= @max_deletes_per_request %> yield_frequency = <%= @yield_frequency %> - diff --git a/templates/proxy/cache.conf.erb b/templates/proxy/cache.conf.erb index 88cbeb51..6636bded 100644 --- a/templates/proxy/cache.conf.erb +++ b/templates/proxy/cache.conf.erb @@ -1,3 +1,4 @@ + [filter:cache] use = egg:swift#memcache memcache_servers = <%= [@memcache_servers].flatten.join(',') %> diff --git a/templates/proxy/catch_errors.conf.erb b/templates/proxy/catch_errors.conf.erb index 0baf5095..25f00869 100644 --- a/templates/proxy/catch_errors.conf.erb +++ b/templates/proxy/catch_errors.conf.erb @@ -1,3 +1,3 @@ + [filter:catch_errors] use = egg:swift#catch_errors - diff --git a/templates/proxy/ceilometer.conf.erb b/templates/proxy/ceilometer.conf.erb index 1bc6bc88..73a7d03d 100644 --- a/templates/proxy/ceilometer.conf.erb +++ b/templates/proxy/ceilometer.conf.erb @@ -1,3 +1,3 @@ + [filter:ceilometer] use = egg:ceilometer#swift - diff --git a/templates/proxy/container_quotas.conf.erb b/templates/proxy/container_quotas.conf.erb index 1da47df5..038477f8 100644 --- a/templates/proxy/container_quotas.conf.erb +++ b/templates/proxy/container_quotas.conf.erb @@ -1,4 +1,3 @@ [filter:container_quotas] use = egg:swift#container_quotas - diff --git a/templates/proxy/crossdomain.conf.erb b/templates/proxy/crossdomain.conf.erb index ef21b084..6618c59b 100644 --- a/templates/proxy/crossdomain.conf.erb +++ b/templates/proxy/crossdomain.conf.erb @@ -1,4 +1,4 @@ + [filter:crossdomain] use = egg:swift#crossdomain cross_domain_policy = <%= @cross_domain_policy %> - diff --git a/templates/proxy/formpost.conf.erb b/templates/proxy/formpost.conf.erb index 36077166..0c8388dd 100644 --- a/templates/proxy/formpost.conf.erb +++ b/templates/proxy/formpost.conf.erb @@ -1,4 +1,3 @@ [filter:formpost] use = egg:swift#formpost - diff --git a/templates/proxy/gatekeeper.conf.erb b/templates/proxy/gatekeeper.conf.erb index e7653a27..3c67e5e5 100644 --- a/templates/proxy/gatekeeper.conf.erb +++ b/templates/proxy/gatekeeper.conf.erb @@ -1,3 +1,4 @@ + [filter:gatekeeper] use = egg:swift#gatekeeper set log_name = <%= @log_name %> diff --git a/templates/proxy/healthcheck.conf.erb b/templates/proxy/healthcheck.conf.erb index 355902aa..567e65aa 100644 --- a/templates/proxy/healthcheck.conf.erb +++ b/templates/proxy/healthcheck.conf.erb @@ -1,4 +1,3 @@ [filter:healthcheck] use = egg:swift#healthcheck - diff --git a/templates/proxy/proxy-logging.conf.erb b/templates/proxy/proxy-logging.conf.erb index f3466a54..d20e59fd 100644 --- a/templates/proxy/proxy-logging.conf.erb +++ b/templates/proxy/proxy-logging.conf.erb @@ -1,3 +1,3 @@ + [filter:proxy-logging] use = egg:swift#proxy_logging - diff --git a/templates/proxy/ratelimit.conf.erb b/templates/proxy/ratelimit.conf.erb index b4b6563c..ca6af928 100644 --- a/templates/proxy/ratelimit.conf.erb +++ b/templates/proxy/ratelimit.conf.erb @@ -1,3 +1,4 @@ + [filter:ratelimit] use = egg:swift#ratelimit clock_accuracy = <%= @clock_accuracy %> @@ -5,4 +6,3 @@ max_sleep_time_seconds = <%= @max_sleep_time_seconds %> log_sleep_time_seconds = <%= @log_sleep_time_seconds %> rate_buffer_seconds = <%= @rate_buffer_seconds %> account_ratelimit = <%= @account_ratelimit %> - diff --git a/templates/proxy/s3token.conf.erb b/templates/proxy/s3token.conf.erb index 82b5363f..d02c0835 100644 --- a/templates/proxy/s3token.conf.erb +++ b/templates/proxy/s3token.conf.erb @@ -1,3 +1,4 @@ + [filter:s3token] paste.filter_factory = keystonemiddleware.s3_token:filter_factory auth_port = <%= @auth_port %> diff --git a/templates/proxy/slo.conf.erb b/templates/proxy/slo.conf.erb index 1b815eae..edfe3168 100644 --- a/templates/proxy/slo.conf.erb +++ b/templates/proxy/slo.conf.erb @@ -1,3 +1,4 @@ + [filter:slo] use = egg:swift#slo max_manifest_segments = <%= @max_manifest_segments %> diff --git a/templates/proxy/staticweb.conf.erb b/templates/proxy/staticweb.conf.erb index 1e31cb18..2f7867f6 100644 --- a/templates/proxy/staticweb.conf.erb +++ b/templates/proxy/staticweb.conf.erb @@ -1,4 +1,3 @@ [filter:staticweb] use = egg:swift#staticweb - diff --git a/templates/proxy/swauth.conf.erb b/templates/proxy/swauth.conf.erb index f83a1916..adf3f4ab 100644 --- a/templates/proxy/swauth.conf.erb +++ b/templates/proxy/swauth.conf.erb @@ -4,4 +4,3 @@ use = egg:swauth#swauth # this line is not in the install docs? default_swift_cluster = local#<%= @swauth_endpoint %> super_admin_key = <%= @swauth_super_admin_key %> - diff --git a/templates/proxy/swift3.conf.erb b/templates/proxy/swift3.conf.erb index 1ce14662..0a0aa194 100644 --- a/templates/proxy/swift3.conf.erb +++ b/templates/proxy/swift3.conf.erb @@ -1,3 +1,3 @@ + [filter:swift3] use = egg:swift3#swift3 - diff --git a/templates/recon.conf.erb b/templates/recon.conf.erb index 82bf06dc..e7efb266 100644 --- a/templates/recon.conf.erb +++ b/templates/recon.conf.erb @@ -1,3 +1,4 @@ + [filter:recon] use = egg:swift#recon recon_cache_path = <%= @cache_path %>