deploy-elasticsearch.rb in rubber-2.7.0

- old
+ new
@@ -6,24 +6,24 @@
 
     after "rubber:install_packages", "rubber:elasticsearch:install"
 
     task :install, :roles => :elasticsearch do
       rubber.sudo_script 'install_elasticsearch', <<-ENDSCRIPT
-        if [[ ! -d "#{rubber_env.elasticsearch_dir}" ]]; then
-          wget --no-check-certificate -qNP /tmp http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-#{rubber_env.elasticsearch_version}.zip
-          unzip -d #{rubber_env.elasticsearch_prefix} /tmp/elasticsearch-#{rubber_env.elasticsearch_version}.zip
-          rm /tmp/elasticsearch-#{rubber_env.elasticsearch_version}.zip
+        if [[ ! -f /usr/share/elasticsearch/lib/elasticsearch-#{rubber_env.elasticsearch_version}.jar ]]; then
+          wget -qNP /tmp https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-#{rubber_env.elasticsearch_version}.deb
+          dpkg -i /tmp/elasticsearch-#{rubber_env.elasticsearch_version}.deb
+          rm /tmp/elasticsearch-#{rubber_env.elasticsearch_version}.deb
 
-          #{rubber_env.elasticsearch_dir}/bin/plugin -install mobz/elasticsearch-head
-          
+          rm -rf /usr/share/elasticsearch/plugins/head
+          /usr/share/elasticsearch/bin/plugin -install mobz/elasticsearch-head
         fi
       ENDSCRIPT
     end
 
     after "rubber:bootstrap", "rubber:elasticsearch:bootstrap"
 
     task :bootstrap, :roles => :elasticsearch do
-      exists = capture("echo $(ls /etc/init/elasticsearch.conf 2> /dev/null)")
+      exists = capture("echo $(ls #{rubber_env.elasticsearch_data_dir} 2> /dev/null)")
       if exists.strip.size == 0
         # After everything installed on machines, we need the source tree
         # on hosts in order to run rubber:config for bootstrapping the db
         rubber.update_code_for_bootstrap
         rubber.run_config(:file => "role/elasticsearch/", :force => true, :deploy_path => release_path)