From d9a48939cf2fdf4ab93ab1a13b4de96d0a8bb573 Mon Sep 17 00:00:00 2001 From: benoitc Date: Mon, 5 Dec 2011 16:40:37 +0100 Subject: [PATCH] use couch_replicator app. --- rebar.config | 4 ++++ rel/files/default.ini | 3 +-- rel/reltool.config | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/rebar.config b/rebar.config index 887027bd..a9e582b5 100644 --- a/rebar.config +++ b/rebar.config @@ -14,6 +14,10 @@ {couch_mrview, ".*", {git, "git://github.com/refuge/couch_mrview.git", {branch, "master"}}}, + %% couch replicator + {couch_replicator, ".*", {git, "git://github.com/refuge/couch_replicator.git", + {branch, "master"}}}, + %% spatial indexer {geocouch, ".*", {git, "git://github.com/refuge/geocouch.git", {branch, master}}} diff --git a/rel/files/default.ini b/rel/files/default.ini index 86f10be8..4777c983 100644 --- a/rel/files/default.ini +++ b/rel/files/default.ini @@ -82,7 +82,6 @@ stats_aggregator={couch_stats_aggregator, start, []} stats_collector={couch_stats_collector, start, []} uuids={couch_uuids, start, []} auth_cache={couch_auth_cache, start_link, []} -replication_manager={couch_replication_manager, start_link, []} os_daemons={couch_os_daemons, start_link, []} compaction_daemon={couch_compaction_daemon, start_link, []} @@ -95,7 +94,7 @@ _utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "{{platform_share_dir _all_dbs = {couch_httpd_misc_handlers, handle_all_dbs_req} _active_tasks = {couch_httpd_misc_handlers, handle_task_status_req} _config = {couch_httpd_misc_handlers, handle_config_req} -_replicate = {couch_httpd_replicator, handle_req} +_replicate = {couch_replicator_httpd, handle_req} _uuids = {couch_httpd_misc_handlers, handle_uuids_req} _restart = {couch_httpd_misc_handlers, handle_restart_req} _stats = {couch_httpd_stats_handlers, handle_stats_req} diff --git a/rel/reltool.config b/rel/reltool.config index 0b83afa2..28b9c6b6 100644 --- a/rel/reltool.config +++ b/rel/reltool.config @@ -23,6 +23,7 @@ couch, couch_index, couch_mrview, + couch_replicator, vtree, geocouch ]}, @@ -41,15 +42,18 @@ {app, public_key, [{incl_cond, include}]}, {app, ssl, [{incl_cond, include}]}, - + %% dependencies {app, mochiweb, [{incl_cond, include}]}, {app, oauth, [{incl_cond, include}]}, {app, ejson, [{incl_cond, include}]}, {app, snappy, [{incl_cond, include}]}, {app, ibrowse, [{incl_cond, include}]}, + + %% couchdb {app, couch, [{incl_cond, include}]}, {app, couch_index, [{incl_cond, include}]}, {app, couch_mrview, [{incl_cond, include}]}, + {app, couch_replicator, [{incl_cond, include}]}, {app, vtree, [{incl_cond, include}]}, {app, geocouch, [{incl_cond, include}]} ]}.