Navigation Menu

Skip to content

Commit

Permalink
Extract common attributes to "common"
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Apr 21, 2014
1 parent 361249c commit 779b3be
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
9 changes: 4 additions & 5 deletions droonga/attributes/default.rb
@@ -1,18 +1,17 @@
default.droonga.common.host = node.name
default.droonga.common.tag = "droonga"
default.droonga.common.default_dataset = "Droonga"

default.droonga.engine.user_name = "droonga-engine"
default.droonga.engine.group_name = "droonga-engine"
default.droonga.engine.home = "/home/droonga-engine"
default.droonga.engine.ruby = "ruby"
default.droonga.engine.host = node.name
default.droonga.engine.port = 10031
default.droonga.engine.tag = "droonga"
default.droonga.engine.template.cookbooks = {}

default.droonga.http_server.user_name = "droonga-http-server"
default.droonga.http_server.group_name = "droonga-http-server"
default.droonga.http_server.home = "/home/droonga-http-server"
default.droonga.http_server.node = "node"
default.droonga.http_server.host = node.name
default.droonga.http_server.port = 13000
default.droonga.http_server.tag = "droonga"
default.droonga.http_server.default_dataset = "Droonga"
default.droonga.http_server.cache_size = 100
1 change: 1 addition & 0 deletions droonga/recipes/http-server.rb
Expand Up @@ -21,6 +21,7 @@
include_recipe "npm"
include_recipe "git"

droonga_common = node.droonga.common
droonga_http_server = node.droonga.http_server

user_name = droonga_http_server.user_name
Expand Down
9 changes: 5 additions & 4 deletions droonga/templates/default/droonga-engine-catalog.json.erb
@@ -1,3 +1,4 @@
<% common = node.droonga.common %>
<% engine = node.droonga.engine %>
{
"version": 2,
Expand All @@ -14,13 +15,13 @@
{
"weight": 50,
"volume": {
"address": "<%= engine.host %>:<%= engine.port %>/<%= engine.tag %>.000"
"address": "<%= common.host %>:<%= engine.port %>/<%= common.tag %>.000"
}
},
{
"weight": 50,
"volume": {
"address": "<%= engine.host %>:<%= engine.port %>/<%= engine.tag %>.001"
"address": "<%= common.host %>:<%= engine.port %>/<%= common.tag %>.001"
}
}
]
Expand All @@ -32,13 +33,13 @@
{
"weight": 50,
"volume": {
"address": "<%= engine.host %>:<%= engine.port %>/<%= engine.tag %>.010"
"address": "<%= common.host %>:<%= engine.port %>/<%= common.tag %>.010"
}
},
{
"weight": 50,
"volume": {
"address": "<%= engine.host %>:<%= engine.port %>/<%= engine.tag %>.011"
"address": "<%= common.host %>:<%= engine.port %>/<%= common.tag %>.011"
}
}
]
Expand Down
5 changes: 3 additions & 2 deletions droonga/templates/default/sv-droonga-engine-run.erb
@@ -1,4 +1,5 @@
#!/bin/bash
<% common = node.droonga.common %>
<% engine = node.droonga.engine %>

exec 2>&1
Expand All @@ -18,6 +19,6 @@ export DROONGA_CATALOG="${config_dir}/catalog.json"
cd "$work_dir"
exec chpst -u "$user:$group" \
bundle exec "${work_dir}/bin/droonga-engine" \
--host "<%= engine.host %>" \
--host "<%= common.host %>" \
--port <%= engine.port %> \
--tag "<%= engine.tag %>"
--tag "<%= common.tag %>"
9 changes: 5 additions & 4 deletions droonga/templates/default/sv-droonga-http-server-run.erb
@@ -1,4 +1,5 @@
#!/bin/bash
<% common = node.droonga.common %>
<% engine = node.droonga.engine %>
<% http_server = node.droonga.http_server %>

Expand All @@ -16,11 +17,11 @@ work_dir="$(eval "echo ~${user}")/droonga-http-server/current"
cd "$work_dir"
exec chpst -u "$user:$group" \
"${work_dir}/bin/droonga-http-server" \
--host "<%= http_server.host %>" \
--host "<%= common.host %>" \
--port <%= http_server.port %> \
--tag "<%= http_server.tag %>" \
--tag "<%= common.tag %>" \
--receive-host-name <%= http_server.port %> \
--droonga-engine-host-name <%= engine.host %> \
--droonga-engine-host-name <%= common.host %> \
--droonga-engine-port <%= engine.port %> \
--droonga-default-dataset <%= http_server.default_dataset %> \
--droonga-default-dataset <%= common.default_dataset %> \
--cache-size <%= http_server.cache_size %>

0 comments on commit 779b3be

Please sign in to comment.