Merge "Swift configuration parameter audit"

7 files changed, 16 insertions, 6 deletions

diff --git a/etc/account-server.conf-sample b/etc/account-server.conf-sample
index 85f330f3d..5b0388692 100644
--- a/etc/account-server.conf-sample
+++ b/etc/account-server.conf-sample
@@ -110,6 +110,8 @@ use = egg:swift#recon
 # reclaim_age = 604800
 #
 # Time in seconds to wait between replication passes
+# Note: if the parameter 'interval' is defined then it will be used in place
+# of run_pause.
 # run_pause = 30
 #
 # recon_cache_path = /var/cache/swift
diff --git a/etc/container-reconciler.conf-sample b/etc/container-reconciler.conf-sample
index 0a3de0220..4301641ac 100644
--- a/etc/container-reconciler.conf-sample
+++ b/etc/container-reconciler.conf-sample
@@ -29,7 +29,7 @@
 # in the queue.
 # reclaim_age = 604800
 # The cycle time of the daemon
-# interval = 300
+# interval = 30
 # Server errors from requests will be retried by default
 # request_tries = 3
 
diff --git a/etc/container-server.conf-sample b/etc/container-server.conf-sample
index be94ea48c..e47b2287a 100644
--- a/etc/container-server.conf-sample
+++ b/etc/container-server.conf-sample
@@ -111,6 +111,8 @@ use = egg:swift#recon
 # reclaim_age = 604800
 #
 # Time in seconds to wait between replication passes
+# Note: if the parameter 'interval' is defined then it will be used in place
+# of run_pause.
 # run_pause = 30
 #
 # recon_cache_path = /var/cache/swift
diff --git a/etc/dispersion.conf-sample b/etc/dispersion.conf-sample
index 65813cbb3..7ce920e87 100644
--- a/etc/dispersion.conf-sample
+++ b/etc/dispersion.conf-sample
@@ -4,10 +4,15 @@
 auth_url = http://localhost:8080/auth/v1.0
 auth_user = test:tester
 auth_key = testing
+# auth_version = 1.0
+#
+# NOTE: If you want to use keystone (auth version 2.0), then its configuration
+# would look something like:
 # auth_url = http://localhost:5000/v2.0/
 # auth_user = tenant:user
 # auth_key = password
 # auth_version = 2.0
+#
 # endpoint_type = publicURL
 # keystone_api_insecure = no
 #
diff --git a/etc/drive-audit.conf-sample b/etc/drive-audit.conf-sample
index a07f0a8ac..50613ae7e 100644
--- a/etc/drive-audit.conf-sample
+++ b/etc/drive-audit.conf-sample
@@ -11,7 +11,7 @@
 #
 # Location of the log file with globbing
 # pattern to check against device errors.
-# log_file_pattern = /var/log/kern*
+# log_file_pattern = /var/log/kern.*[!.][!g][!z]
 #
 # Regular expression patterns to be used to locate
 # device blocks with errors in the log file. Currently
@@ -19,7 +19,7 @@
 #   \berror\b.*\b(sd[a-z]{1,2}\d?)\b
 #   \b(sd[a-z]{1,2}\d?)\b.*\berror\b
 # One can overwrite the default ones by providing
-# new expressions using the format below: 
+# new expressions using the format below:
 # Format: regex_pattern_X = regex_expression
 # Example:
 #   regex_pattern_1 = \berror\b.*\b(dm-[0-9]{1,2}\d?)\b
diff --git a/etc/object-expirer.conf-sample b/etc/object-expirer.conf-sample
index 61e8f9887..87840a48b 100644
--- a/etc/object-expirer.conf-sample
+++ b/etc/object-expirer.conf-sample
@@ -50,6 +50,7 @@
 # up to reclaim_age seconds before it gives up and deletes the entry in the
 # queue.
 # reclaim_age = 604800
+# recon_cache_path = /var/cache/swift
 
 [pipeline:main]
 pipeline = catch_errors proxy-logging cache proxy-server
diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample
index 77aac3627..0e10892a7 100644
--- a/etc/proxy-server.conf-sample
+++ b/etc/proxy-server.conf-sample
@@ -70,6 +70,7 @@
 #
 # Use a comma separated list of full url (http://foo.bar:1234,https://foo.bar)
 # cors_allow_origin =
+# strict_cors_mode = True
 #
 # client_timeout = 60
 # eventlet_debug = false
@@ -88,8 +89,8 @@ use = egg:swift#proxy
 # log_handoffs = true
 # recheck_account_existence = 60
 # recheck_container_existence = 60
-# object_chunk_size = 8192
-# client_chunk_size = 8192
+# object_chunk_size = 65536
+# client_chunk_size = 65536
 #
 # How long the proxy server will wait on responses from the a/c/o servers.
 # node_timeout = 10
@@ -204,7 +205,6 @@ use = egg:swift#proxy
 # usually indicates administrative responsibilities.
 # swift_owner_headers = x-container-read, x-container-write, x-container-sync-key, x-container-sync-to, x-account-meta-temp-url-key, x-account-meta-temp-url-key-2, x-account-access-control
 
-
 [filter:tempauth]
 use = egg:swift#tempauth
 # You can override the default log routing for this filter here: