Repository: james-project Updated Branches: refs/heads/master d1d75d16f -> 4850f83a8
JAMES-2606 Stop looking for 'objectstorage' file, look for 'blobstore' instead Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/608d10db Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/608d10db Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/608d10db Branch: refs/heads/master Commit: 608d10db01bb0652e2538d3adb4e67d75c4967d0 Parents: b076dab Author: Gautier DI FOLCO <gdifo...@linagora.com> Authored: Fri Nov 23 19:17:46 2018 +0100 Committer: Gautier DI FOLCO <gdifo...@linagora.com> Committed: Fri Nov 30 17:19:47 2018 +0100 ---------------------------------------------------------------------- .../package/etc/james/templates/blobstore.properties | 11 +++++++++++ .../package/etc/james/templates/objectstorage.properties | 11 ----------- .../objectstorage/ObjectStorageBlobConfiguration.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/608d10db/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/blobstore.properties ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/blobstore.properties b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/blobstore.properties new file mode 100644 index 0000000..9ab4beb --- /dev/null +++ b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/blobstore.properties @@ -0,0 +1,11 @@ +# Configuration for swift BlobStore +objectstorage.payload.codec=DEFAULT +objectstorage.provider=swift +objectstorage.namespace=james +objectstorage.swift.authapi=tmpauth +objectstorage.swift.endpoint=http://swift:8080/auth/v1.0 +objectstorage.swift.credentials=testing +objectstorage.swift.tempauth.username=tester +objectstorage.swift.tempauth.tenantname=test +objectstorage.swift.tempauth.passheadername=X-Storage-Pass +objectstorage.swift.tempauth.userheadername=X-Storage-User \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/608d10db/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/objectstorage.properties ---------------------------------------------------------------------- diff --git a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/objectstorage.properties b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/objectstorage.properties deleted file mode 100644 index 9ab4beb..0000000 --- a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/objectstorage.properties +++ /dev/null @@ -1,11 +0,0 @@ -# Configuration for swift BlobStore -objectstorage.payload.codec=DEFAULT -objectstorage.provider=swift -objectstorage.namespace=james -objectstorage.swift.authapi=tmpauth -objectstorage.swift.endpoint=http://swift:8080/auth/v1.0 -objectstorage.swift.credentials=testing -objectstorage.swift.tempauth.username=tester -objectstorage.swift.tempauth.tenantname=test -objectstorage.swift.tempauth.passheadername=X-Storage-Pass -objectstorage.swift.tempauth.userheadername=X-Storage-User \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/608d10db/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java ---------------------------------------------------------------------- diff --git a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java index a58a8d9..c22a99a 100644 --- a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java +++ b/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java @@ -36,7 +36,7 @@ import com.google.common.base.Strings; public class ObjectStorageBlobConfiguration { - private static final String OBJECTSTORAGE_CONFIGURATION_NAME = "objectstorage"; + private static final String OBJECTSTORAGE_CONFIGURATION_NAME = "blobstore"; private static final String OBJECTSTORAGE_NAMESPACE = "objectstorage.namespace"; private static final String OBJECTSTORAGE_PROVIDER = "objectstorage.provider"; private static final String OBJECTSTORAGE_SWIFT_AUTH_API = "objectstorage.swift.authapi"; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
