From 9db5a67a80bc6c8429a9fe2a43c4dcd730bedde6 Mon Sep 17 00:00:00 2001 From: Jean-Bernard DAMIANO Date: Thu, 6 Nov 2014 11:31:14 +0100 Subject: [PATCH 1/3] Update default.rb enable service for startup --- recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/default.rb b/recipes/default.rb index cdb0cff0b..b41273b89 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -89,7 +89,7 @@ end service "elasticsearch" do supports :status => true, :restart => true - action [ :nothing ] + action [ :enable ] end else template "/etc/init.d/elasticsearch" do From 6f770ce7807cf879cd9dfccf022cde3797ec9633 Mon Sep 17 00:00:00 2001 From: Jean-Bernard DAMIANO Date: Thu, 6 Nov 2014 13:47:07 +0100 Subject: [PATCH 2/3] Update metadata.rb upgrade version --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index d793b7cbf..d5d00970d 100644 --- a/metadata.rb +++ b/metadata.rb @@ -5,7 +5,7 @@ license "Apache" description "Installs and configures elasticsearch" long_description IO.read(File.join(File.dirname(__FILE__), 'README.markdown')) -version "0.3.12" +version "0.3.13" depends 'ark', '>= 0.2.4' From ac3d147c426be82c75b8cf7d088c4d51013c9976 Mon Sep 17 00:00:00 2001 From: Jean-Bernard DAMIANO Date: Thu, 6 Nov 2014 13:58:12 +0100 Subject: [PATCH 3/3] Update elasticsearch.init.erb Increase max waiting stop --- templates/default/elasticsearch.init.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/default/elasticsearch.init.erb b/templates/default/elasticsearch.init.erb index 025238d40..bc42b2109 100644 --- a/templates/default/elasticsearch.init.erb +++ b/templates/default/elasticsearch.init.erb @@ -89,7 +89,7 @@ stop() { while [ $(ps -p $pid | wc -l ) -gt '1' ]; do echo -n '.' (( timeout ++)) - if [ $timeout -gt '30' ]; then return 1; fi + if [ $timeout -gt '60' ]; then return 1; fi sleep 1 done