Skip to content

Commit

Permalink
add farmer
Browse files Browse the repository at this point in the history
  • Loading branch information
benoitc committed Jun 5, 2011
1 parent 0e8519e commit 0a79f7a
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 17 deletions.
15 changes: 10 additions & 5 deletions Makefile
Expand Up @@ -85,9 +85,14 @@ archive: dist
tar -cvzf ../refuge-$(VERSION)-$(OS)-$(ARCH).tar.gz .)

dev: all
@rm -rf rel/tmpdata
@rm -rf rel/dev
@echo "==> Building development node (ports 15984/15986)"
@./rebar generate target_dir=dev overlay_vars=dev.config
@rm -rf rel/tmpdata1 rel/tmpdata2 rel/tmpdata3
@rm -rf rel/dev1 rel/dev2 rel/dev3
@echo "==> Building development node #1 (ports 15984/15986)"
@./rebar generate target_dir=dev1 overlay_vars=dev1.config
@echo "==> Building development node #2 (ports 25984/25986)"
@./rebar generate target_dir=dev2 overlay_vars=dev2.config
@echo "==> Building development node #3 (ports 35984/35986)"
@./rebar generate target_dir=dev3 overlay_vars=dev3.config
@echo "\n\
Development node is built, and can be started using ./rel/dev/bin/refuge.\n"
Development nodes are built, and can be started using ./rel/dev[123]/bin/refuge.\n"

22 changes: 12 additions & 10 deletions configure
Expand Up @@ -135,17 +135,19 @@ EOF

# finally, a few config files for local development nodes

cat > rel/dev.config << EOF
{prefix, "$DIRPATH/rel/dev"}.
{data_dir, "$DIRPATH/rel/tmpdata/dev"}.
{view_dir, "$DIRPATH/rel/tmpdata/dev"}.
{sysconf_dir, "$DIRPATH/rel/dev/etc"}.
{run_dir, "$DIRPATH/rel/dev/var/run"}.
{log_dir, "$DIRPATH/rel/dev/var/log"}.
for i in 1 2 3; do
cat > rel/dev$i.config << EOF
{prefix, "$DIRPATH/rel/dev$i"}.
{data_dir, "$DIRPATH/rel/tmpdata/dev$i"}.
{view_dir, "$DIRPATH/rel/tmpdata/dev$i"}.
{sysconf_dir, "$DIRPATH/rel/dev$i/etc"}.
{run_dir, "$DIRPATH/rel/dev$i/var/run"}.
{log_dir, "$DIRPATH/rel/dev$i/var/log"}.
{user, "$REFUGE_USER"}.
{node_name, "-name dev@127.0.0.1"}.
{couchdb_port, 15984}.
{ssl_port, 16986}.
{node_name, "-name dev$i@127.0.0.1"}.
{couchdb_port, `expr 10000 \* $i + 5984`}.
{ssl_port, `expr 10000 \* $i + 5986`}.
EOF
done

cat rel/refuge.config
3 changes: 3 additions & 0 deletions rebar.config
Expand Up @@ -22,6 +22,9 @@
{geocouch, ".*", {git, "git://refuge.io/geocouch.git",
{branch, "1.2.x"}}},
{rhttpd, ".*", {git, "git://refuge.io/rhttpd.git",
"master"}},

{farmer, ".*", {git, "git://refuge.io/farmer.git",
"master"}}
]}.

Expand Down
7 changes: 6 additions & 1 deletion rel/overlay/etc/refuge/default.ini
Expand Up @@ -27,7 +27,7 @@ keyvalue_buffer_size = 2097152 ; value in bytes

[httpd]
port = {{couchdb_port}}
bind_address = 127.0.0.1
bind_address = 0.0.0.0
authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler}
default_handler = {couch_httpd_db, handle_request}
secure_rewrites = true
Expand Down Expand Up @@ -80,6 +80,9 @@ coffeescript = {{prefix}}/bin/couchjs {{prefix}}/share/couchjs/main-coffee.js
reduce_limit = true
os_process_limit = 25

[supervisors]
farmer={farmer_sup, start_link, []}

[daemons]
view_manager={couch_view, start_link, []}
external_manager={couch_external_manager, start_link, []}
Expand Down Expand Up @@ -109,6 +112,8 @@ _stats = {couch_httpd_stats_handlers, handle_stats_req}
_log = {couch_httpd_misc_handlers, handle_log_req}
_session = {couch_httpd_auth, handle_session_req}
_oauth = {couch_httpd_oauth, handle_oauth_req}
_nodes = {farmer_httpd, handle_nodes_req}


[httpd_db_handlers]
_view_cleanup = {couch_httpd_db, handle_view_cleanup_req}
Expand Down
3 changes: 2 additions & 1 deletion rel/reltool.config
Expand Up @@ -28,7 +28,8 @@
snappy,
couch,
geocouch,
rhttpd
rhttpd,
farmer
]},
{rel, "start_clean", "", [kernel, stdlib]},
{boot_rel, "refuge"},
Expand Down

0 comments on commit 0a79f7a

Please sign in to comment.