Merge pull request #11 from gouketsu/fix-rc.d-set

Fix rc.d set
jbdamiano · Nov 6, 2014 · 430866a · 430866a
2 parents a0a7802 + ac3d147
commit 430866a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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'
 

diff --git 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

diff --git 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