5 files changed, 98 insertions, 10 deletions
diff --git a/swift/1.4.8/plugins/conf/account-server/1.conf b/swift/1.4.8/plugins/conf/account-server/1.conf
index 54cbf654003..a82bc35eaa4 100644
--- a/swift/1.4.8/plugins/conf/account-server/1.conf
+++ b/swift/1.4.8/plugins/conf/account-server/1.conf
@@ -6,13 +6,13 @@ user = root
 log_facility = LOG_LOCAL2
 
 [pipeline:main]
-pipeline = gluster account-server
+pipeline = glusterfs account-server
 
 [app:account-server]
 use = egg:swift#account
 
-[filter:gluster]
-use = egg:swift#gluster
+[filter:glusterfs]
+use = egg:swift#glusterfs
 
 [account-replicator]
 vm_test_mode = yes
diff --git a/swift/1.4.8/plugins/conf/container-server/1.conf b/swift/1.4.8/plugins/conf/container-server/1.conf
index 9e776838f58..e6d313c3872 100644
--- a/swift/1.4.8/plugins/conf/container-server/1.conf
+++ b/swift/1.4.8/plugins/conf/container-server/1.conf
@@ -6,13 +6,13 @@ user = root
 log_facility = LOG_LOCAL2
 
 [pipeline:main]
-pipeline = gluster container-server
+pipeline = glusterfs container-server
 
 [app:container-server]
 use = egg:swift#container
 
-[filter:gluster]
-use = egg:swift#gluster
+[filter:glusterfs]
+use = egg:swift#glusterfs
 
 [container-replicator]
 vm_test_mode = yes
diff --git a/swift/1.4.8/plugins/conf/object-server/1.conf b/swift/1.4.8/plugins/conf/object-server/1.conf
index f191cefcf01..665aa94be8b 100644
--- a/swift/1.4.8/plugins/conf/object-server/1.conf
+++ b/swift/1.4.8/plugins/conf/object-server/1.conf
@@ -6,13 +6,13 @@ user = root
 log_facility = LOG_LOCAL2
 
 [pipeline:main]
-pipeline = gluster object-server
+pipeline = glusterfs object-server
 
 [app:object-server]
 use = egg:swift#object
 
-[filter:gluster]
-use = egg:swift#gluster
+[filter:glusterfs]
+use = egg:swift#glusterfs
 
 [object-replicator]
 vm_test_mode = yes
diff --git a/swift/1.4.8/plugins/conf/proxy-server.conf b/swift/1.4.8/plugins/conf/proxy-server.conf
index 1fcde8e0d3a..9bec6425355 100644
--- a/swift/1.4.8/plugins/conf/proxy-server.conf
+++ b/swift/1.4.8/plugins/conf/proxy-server.conf
@@ -4,7 +4,7 @@ user = root
 log_facility = LOG_LOCAL1
 
 [pipeline:main]
-pipeline = healthcheck cache tempauth proxy-server
+pipeline = healthcheck cache tempauth gluster proxy-server
 
 [app:proxy-server]
 use = egg:swift#proxy
@@ -19,3 +19,6 @@ use = egg:swift#healthcheck
 
 [filter:cache]
 use = egg:swift#memcache
+
+[filter:gluster]
+use = egg:swift#gluster
+\ No newline at end of file
diff --git a/swift/1.4.8/plugins/conf/swift.conf b/swift/1.4.8/plugins/conf/swift.conf
index f9864e35231..e506b6f54a8 100644
--- a/swift/1.4.8/plugins/conf/swift.conf
+++ b/swift/1.4.8/plugins/conf/swift.conf
@@ -1,7 +1,92 @@
 [DEFAULT]
 Enable_plugin = yes
 
+
 [swift-hash]
 # random unique string that can never change (DO NOT LOSE)
 swift_hash_path_suffix = gluster
 
+
+# The swift-constraints section sets the basic constraints on data
+# saved in the swift cluster.
+
+[swift-constraints]
+
+# max_file_size is the largest "normal" object that can be saved in
+# the cluster. This is also the limit on the size of each segment of
+# a "large" object when using the large object manifest support.
+# This value is set in bytes. Setting it to lower than 1MiB will cause
+# some tests to fail. It is STRONGLY recommended to leave this value at
+# the default (5 * 2**30 + 2).
+
+# FIXME: Really? Gluster can handle a 2^64 sized file? And can the fronting
+# web service handle such a size? I think with UFO, we need to keep with the
+# default size from Swift and encourage users to research what size their web
+# services infrastructure can handle.
+
+max_file_size = 18446744073709551616
+
+
+# max_meta_name_length is the max number of bytes in the utf8 encoding
+# of the name portion of a metadata header.
+
+#max_meta_name_length = 128
+
+
+# max_meta_value_length is the max number of bytes in the utf8 encoding
+# of a metadata value
+
+#max_meta_value_length = 256
+
+
+# max_meta_count is the max number of metadata keys that can be stored
+# on a single account, container, or object
+
+#max_meta_count = 90
+
+
+# max_meta_overall_size is the max number of bytes in the utf8 encoding
+# of the metadata (keys + values)
+
+#max_meta_overall_size = 4096
+
+
+# max_object_name_length is the max number of bytes in the utf8 encoding of an
+# object name: Gluster FS can handle much longer file names, but the length
+# between the slashes of the URL is handled below. Remember that most web
+# clients can't handle anything greater than 2048, and those that do are
+# rather clumsy.
+
+max_object_name_length = 2048
+
+# max_object_name_component_length (GlusterFS) is the max number of bytes in
+# the utf8 encoding of an object name component (the part between the
+# slashes); this is a limit imposed by the underlying file system (for XFS it
+# is 255 bytes).
+
+max_object_name_component_length = 255
+
+# container_listing_limit is the default (and max) number of items
+# returned for a container listing request
+
+#container_listing_limit = 10000
+
+
+# account_listing_limit is the default (and max) number of items returned
+# for an account listing request
+
+#account_listing_limit = 10000
+
+
+# max_account_name_length is the max number of bytes in the utf8 encoding of
+# an account name: Gluster FS Filename limit (XFS limit?), must be the same
+# size as max_object_name_component_length above.
+
+max_account_name_length = 255
+
+
+# max_container_name_length is the max number of bytes in the utf8 encoding
+# of a container name: Gluster FS Filename limit (XFS limit?), must be the same
+# size as max_object_name_component_length above.
+
+max_container_name_length = 255