YUKI Hiroshi
null+****@clear*****
Fri Apr 18 17:30:12 JST 2014
YUKI Hiroshi 2014-04-18 17:30:12 +0900 (Fri, 18 Apr 2014) New Revision: 07aed2bc07f1e615faec5bb57ae4744da0e43592 https://github.com/droonga/chef-cookbooks/commit/07aed2bc07f1e615faec5bb57ae4744da0e43592 Message: Remove needless fluentd.conf Removed files: droonga/templates/default/droonga-engine-fluentd.conf.erb Modified files: droonga/recipes/engine.rb droonga/templates/default/sv-droonga-engine-run.erb Modified: droonga/recipes/engine.rb (+0 -8) =================================================================== --- droonga/recipes/engine.rb 2014-04-18 17:28:38 +0900 (efdeb42) +++ droonga/recipes/engine.rb 2014-04-18 17:30:12 +0900 (7f7718e) @@ -79,14 +79,6 @@ deploy "#{home_dir}/droonga-engine" do mode 0755 end - template "#{config_dir}/fluentd.conf" do - source "droonga-engine-fluentd.conf.erb" - cookbook droonga_engine.template.cookbooks["fluentd.conf"] - user user_name - group group_name - mode 0644 - end - template "#{config_dir}/catalog.json" do source "droonga-engine-catalog.json.erb" cookbook droonga_engine.template.cookbooks["catalog.json"] Deleted: droonga/templates/default/droonga-engine-fluentd.conf.erb (+0 -12) 100644 =================================================================== --- droonga/templates/default/droonga-engine-fluentd.conf.erb 2014-04-18 17:28:38 +0900 (5fa19c8) +++ /dev/null @@ -1,12 +0,0 @@ -<% engine = node.droonga.engine %> -<source> - type forward - port <%= engine.port %> -</source> -<match <%= engine.tag %>.message> - name <%= engine.host %>:<%= engine.port %>/<%= engine.tag %> - type droonga -</match> -<match output.message> - type stdout -</match> Modified: droonga/templates/default/sv-droonga-engine-run.erb (+0 -1) =================================================================== --- droonga/templates/default/sv-droonga-engine-run.erb 2014-04-18 17:28:38 +0900 (e306e25) +++ droonga/templates/default/sv-droonga-engine-run.erb 2014-04-18 17:30:12 +0900 (dc4d9d2) @@ -13,7 +13,6 @@ group="<%= engine.group_name %>" work_dir="$(eval "echo ~${user}")/droonga-engine/current" config_dir="${work_dir}/config" -fluentd_conf="${config_dir}/fluentd.conf" export DROONGA_CATALOG="${config_dir}/catalog.json" cd "$work_dir" -------------- next part -------------- HTML����������������������������...Download