Kouhei Sutou
null+****@clear*****
Mon Jan 27 15:13:48 JST 2014
Kouhei Sutou 2014-01-27 15:13:48 +0900 (Mon, 27 Jan 2014) New Revision: 98c3f72e27079bf776e15cc69f1d70acb9176fed https://github.com/droonga/chef-cookbooks/commit/98c3f72e27079bf776e15cc69f1d70acb9176fed Message: Make host customizable Modified files: droonga/attributes/default.rb droonga/templates/default/droonga-engine-catalog.json.erb droonga/templates/default/droonga-engine-fluentd.conf.erb Modified: droonga/attributes/default.rb (+1 -0) =================================================================== --- droonga/attributes/default.rb 2014-01-27 15:05:48 +0900 (005f254) +++ droonga/attributes/default.rb 2014-01-27 15:13:48 +0900 (5bca7c9) @@ -2,6 +2,7 @@ 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 = 24224 default.droonga.engine.tag = "droonga" default.droonga.engine.template.cookbooks = {} Modified: droonga/templates/default/droonga-engine-catalog.json.erb (+8 -8) =================================================================== --- droonga/templates/default/droonga-engine-catalog.json.erb 2014-01-27 15:05:48 +0900 (00c80af) +++ droonga/templates/default/droonga-engine-catalog.json.erb 2014-01-27 15:13:48 +0900 (054ce3c) @@ -1,9 +1,9 @@ <% engine = node.droonga.engine %> { "effective_date": "2014-01-24T00:00:00Z", - "zones": ["localhost:<%= engine.port %>/<%= engine.tag %>"], + "zones": ["<%= engine.host %>:<%= engine.port %>/<%= engine.tag %>"], "farms": { - "localhost:<%= engine.port %>/<%= engine.tag %>": { + "<%= engine.host %>:<%= engine.port %>/<%= engine.tag %>": { "device": ".", "capacity": 10 } @@ -17,21 +17,21 @@ "partition_key": "_key", "date_range": "infinity", "ring": { - "localhost:23041": { + "<%= engine.host %>:23041": { "weight": 50, "partitions": { "2014-01-24": [ - "localhost:<%= engine.port %>/<%= engine.tag %>.000", - "localhost:<%= engine.port %>/<%= engine.tag %>.001" + "<%= engine.host %>:<%= engine.port %>/<%= engine.tag %>.000", + "<%= engine.host %>:<%= engine.port %>/<%= engine.tag %>.001" ] } }, - "localhost:23042": { + "<%= engine.host %>:23042": { "weight": 50, "partitions": { "2014-01-24": [ - "localhost:<%= engine.port %>/<%= engine.tag %>.002", - "localhost:<%= engine.port %>/<%= engine.tag %>.003" + "<%= engine.host %>:<%= engine.port %>/<%= engine.tag %>.002", + "<%= engine.host %>:<%= engine.port %>/<%= engine.tag %>.003" ] } } Modified: droonga/templates/default/droonga-engine-fluentd.conf.erb (+1 -1) =================================================================== --- droonga/templates/default/droonga-engine-fluentd.conf.erb 2014-01-27 15:05:48 +0900 (bc0177a) +++ droonga/templates/default/droonga-engine-fluentd.conf.erb 2014-01-27 15:13:48 +0900 (543ae19) @@ -4,7 +4,7 @@ port <%= engine.port %> </source> <match <%= engine.tag %>.message> - name localhost:<%= engine.port %>/<%= engine.tag %> + name <%= engine.host %>localhost:<%= engine.port %>/<%= engine.tag %> type droonga </match> <match output.message> -------------- next part -------------- HTML����������������������������...Descargar
