YUKI Hiroshi
null+****@clear*****
Mon Apr 21 14:22:26 JST 2014
YUKI Hiroshi 2014-04-21 14:22:26 +0900 (Mon, 21 Apr 2014) New Revision: 779b3be73bd39bc87049a7369f93f183c30c946a https://github.com/droonga/chef-cookbooks/commit/779b3be73bd39bc87049a7369f93f183c30c946a Message: Extract common attributes to "common" Modified files: droonga/attributes/default.rb droonga/recipes/http-server.rb droonga/templates/default/droonga-engine-catalog.json.erb droonga/templates/default/sv-droonga-engine-run.erb droonga/templates/default/sv-droonga-http-server-run.erb Modified: droonga/attributes/default.rb (+4 -5) =================================================================== --- droonga/attributes/default.rb 2014-04-21 14:17:35 +0900 (4b36221) +++ droonga/attributes/default.rb 2014-04-21 14:22:26 +0900 (011aaa3) @@ -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 Modified: droonga/recipes/http-server.rb (+1 -0) =================================================================== --- droonga/recipes/http-server.rb 2014-04-21 14:17:35 +0900 (38db859) +++ droonga/recipes/http-server.rb 2014-04-21 14:22:26 +0900 (998e59d) @@ -21,6 +21,7 @@ include_recipe "nodejs" 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 Modified: droonga/templates/default/droonga-engine-catalog.json.erb (+5 -4) =================================================================== --- droonga/templates/default/droonga-engine-catalog.json.erb 2014-04-21 14:17:35 +0900 (e07f624) +++ droonga/templates/default/droonga-engine-catalog.json.erb 2014-04-21 14:22:26 +0900 (312dba3) @@ -1,3 +1,4 @@ +<% common = node.droonga.common %> <% engine = node.droonga.engine %> { "version": 2, @@ -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" } } ] @@ -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" } } ] Modified: droonga/templates/default/sv-droonga-engine-run.erb (+3 -2) =================================================================== --- droonga/templates/default/sv-droonga-engine-run.erb 2014-04-21 14:17:35 +0900 (dc4d9d2) +++ droonga/templates/default/sv-droonga-engine-run.erb 2014-04-21 14:22:26 +0900 (7a2286e) @@ -1,4 +1,5 @@ #!/bin/bash +<% common = node.droonga.common %> <% engine = node.droonga.engine %> exec 2>&1 @@ -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 %>" Modified: droonga/templates/default/sv-droonga-http-server-run.erb (+5 -4) =================================================================== --- droonga/templates/default/sv-droonga-http-server-run.erb 2014-04-21 14:17:35 +0900 (a6d2f06) +++ droonga/templates/default/sv-droonga-http-server-run.erb 2014-04-21 14:22:26 +0900 (42dcdad) @@ -1,4 +1,5 @@ #!/bin/bash +<% common = node.droonga.common %> <% engine = node.droonga.engine %> <% http_server = node.droonga.http_server %> @@ -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 %> -------------- next part -------------- HTML����������������������������...Download