Kouhei Sutou
null+****@clear*****
Mon Jan 27 11:57:07 JST 2014
Kouhei Sutou 2014-01-27 11:57:07 +0900 (Mon, 27 Jan 2014) New Revision: c1ffa9dff3a0bda4a2d7dac260cc9c332bfa69a6 https://github.com/droonga/chef-cookbooks/commit/c1ffa9dff3a0bda4a2d7dac260cc9c332bfa69a6 Message: Make port and tag 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 (+2 -0) =================================================================== --- droonga/attributes/default.rb 2014-01-27 11:37:54 +0900 (b7f56a7) +++ droonga/attributes/default.rb 2014-01-27 11:57:07 +0900 (982001a) @@ -2,3 +2,5 @@ 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.port = 24224 +default.droonga.engine.tag = "droonga" Modified: droonga/templates/default/droonga-engine-catalog.json.erb (+7 -6) =================================================================== --- droonga/templates/default/droonga-engine-catalog.json.erb 2014-01-27 11:37:54 +0900 (5fc8a9d) +++ droonga/templates/default/droonga-engine-catalog.json.erb 2014-01-27 11:57:07 +0900 (00c80af) @@ -1,8 +1,9 @@ +<% engine = node.droonga.engine %> { "effective_date": "2014-01-24T00:00:00Z", - "zones": ["localhost:23003/droonga"], + "zones": ["localhost:<%= engine.port %>/<%= engine.tag %>"], "farms": { - "localhost:23003/droonga": { + "localhost:<%= engine.port %>/<%= engine.tag %>": { "device": ".", "capacity": 10 } @@ -20,8 +21,8 @@ "weight": 50, "partitions": { "2014-01-24": [ - "localhost:23003/droonga.000", - "localhost:23003/droonga.001" + "localhost:<%= engine.port %>/<%= engine.tag %>.000", + "localhost:<%= engine.port %>/<%= engine.tag %>.001" ] } }, @@ -29,8 +30,8 @@ "weight": 50, "partitions": { "2014-01-24": [ - "localhost:23003/droonga.002", - "localhost:23003/droonga.003" + "localhost:<%= engine.port %>/<%= engine.tag %>.002", + "localhost:<%= engine.port %>/<%= engine.tag %>.003" ] } } Modified: droonga/templates/default/droonga-engine-fluentd.conf.erb (+4 -3) =================================================================== --- droonga/templates/default/droonga-engine-fluentd.conf.erb 2014-01-27 11:37:54 +0900 (1e26357) +++ droonga/templates/default/droonga-engine-fluentd.conf.erb 2014-01-27 11:57:07 +0900 (bc0177a) @@ -1,9 +1,10 @@ +<% engine = node.droonga.engine %> <source> type forward - port 23003 + port <%= engine.port %> </source> -<match droonga.message> - name localhost:23003/droonga +<match <%= engine.tag %>.message> + name localhost:<%= engine.port %>/<%= engine.tag %> type droonga </match> <match output.message> -------------- next part -------------- HTML����������������������������...Download