Adds configuration for MongoDB store types

Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/3513be76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/3513be76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/3513be76

Branch: refs/heads/fulltextsearch
Commit: 3513be76adf05cde10046c4171c52fceba7a101d
Parents: 543c3cb
Author: Pablo Ojanguren <[email protected]>
Authored: Mon Aug 25 19:35:31 2014 +0300
Committer: Yuri Zelikov <[email protected]>
Committed: Mon Aug 25 19:35:31 2014 +0300

----------------------------------------------------------------------
 server-config.xml     |  6 ++++++
 server.config.example | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/3513be76/server-config.xml
----------------------------------------------------------------------
diff --git a/server-config.xml b/server-config.xml
index 1e8ff69..3fbc576 100644
--- a/server-config.xml
+++ b/server-config.xml
@@ -60,6 +60,9 @@
   <property name="analytics_account" value="" />
   <property name="profile_fetcher_type" value="gravatar" />
   <property name="enable_profiling" value="false" />
+  <property name="mongodb_host" value="127.0.0.1" />
+  <property name="mongodb_port" value="27017" />
+  <property name="mongodb_database" value="wiab" />
 
   <!-- Properties for server.federation.config -->
   <property name="xmpp_server_secret" value="opensesame" />
@@ -144,6 +147,9 @@
           <token key="THUMBNAIL_PATTERNS_DIRECTORY" 
value="${thumbnail_patterns_directory}" />
           <token key="PROFILE_FETCHER_TYPE" value="${profile_fetcher_type}" />
           <token key="ENABLE_PROFILING" value="${enable_profiling}" />
+          <token key="MONGODB_HOST" value="${mongodb_host}" />
+          <token key="MONGODB_PORT" value="${mongodb_port}" />
+          <token key="MONGODB_DATABASE" value="${mongodb_database}" />
         </replacetokens>
       </filterchain>
     </copy>

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/3513be76/server.config.example
----------------------------------------------------------------------
diff --git a/server.config.example b/server.config.example
index f3feba0..f04b19f 100644
--- a/server.config.example
+++ b/server.config.example
@@ -81,7 +81,7 @@ account_store_type = @ACCOUNT_STORE_TYPE@
 # Default value: _accounts
 account_store_directory = @ACCOUNT_STORE_DIRECTORY@
 
-# Currently supported delta store types: memory, file
+# Currently supported delta store types: memory, file, mongodb.
 # Note: file system support is experimental. Your server may crash. And the 
file format is
 # not stable and shouldn't be relied upon for long-term storage yet; upcoming 
changes will
 # require you to blow away your data.
@@ -203,3 +203,15 @@ thumbnail_patterns_directory = 
@THUMBNAIL_PATTERNS_DIRECTORY@
 # Currently supported profile fetcher types: gravatar, initials.
 # Default value: gravatar.
 profile_fetcher_type = @PROFILE_FETCHER_TYPE@
+
+# Mongodb connection options
+# Only used if some of the *_store_type properties are set to 'mongodb'
+
+# Server's host name or IP address. Default value: 127.0.0.1
+mongodb_host = @MONGODB_HOST@
+
+# Server's port. Default value: 27017
+mongodb_port = @MONGODB_PORT@
+
+# Database's name. Default name: wiab
+mongodb_database = @MONGODB_DATABASE@

Reply via email to