Merge pull request #14 from Ledej/fix-update-elasticsearch

Fix the elasticsearch 1.1.0 update

Author: rafaelfranca

files/brews/elasticsearch.rb

@@ -41,20 +41,6 @@ def install
       rm_rf "#{prefix}/target/"
     end
 
-    # Set up Elasticsearch for local development:
-    inreplace "#{prefix}/config/elasticsearch.yml" do |s|
-      # 1. Give the cluster a unique name
-      s.gsub! /#\s*cluster\.name\: elasticsearch/, "cluster.name: #{cluster_name}"
-
-      # 2. Configure paths
-      s.sub! "# path.data: /path/to/data", "path.data: #{var}/elasticsearch/"
-      s.sub! "# path.logs: /path/to/logs", "path.logs: #{var}/log/elasticsearch/"
-      s.sub! "# path.plugins: /path/to/plugins", "path.plugins: #{var}/lib/elasticsearch/plugins"
-
-      # 3. Bind to loopback IP for laptops roaming different networks
-      s.gsub! /#\s*network\.host\: [^\n]+/, "network.host: 127.0.0.1"
-    end
-
     inreplace "#{bin}/elasticsearch.in.sh" do |s|
       # Configure ES_HOME
       s.sub!  /#\!\/bin\/sh\n/, "#!/bin/sh\n\nES_HOME=#{prefix}"
@@ -69,52 +55,4 @@ def install
       s.gsub! /\$ES_HOME\/lib\//, "$ES_CLASSPATH/"
     end
   end
-
-  def post_install
-    # Make sure runtime directories exist
-    (var/"elasticsearch/#{cluster_name}").mkpath
-    (var/"log/elasticsearch").mkpath
-    (var/"lib/elasticsearch/plugins").mkpath
-  end
-
-  def caveats; <<-EOS.undent
-    Data:    #{var}/elasticsearch/#{cluster_name}/
-    Logs:    #{var}/log/elasticsearch/#{cluster_name}.log
-    Plugins: #{var}/lib/elasticsearch/plugins/
-    EOS
-  end
-
-  plist_options :manual => "elasticsearch --config=#{HOMEBREW_PREFIX}/opt/elasticsearch/config/elasticsearch.yml"
-
-  def plist; <<-EOS.undent
-      <?xml version="1.0" encoding="UTF-8"?>
-      <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-      <plist version="1.0">
-        <dict>
-          <key>KeepAlive</key>
-          <true/>
-          <key>Label</key>
-          <string>#{plist_name}</string>
-          <key>ProgramArguments</key>
-          <array>
-            <string>#{HOMEBREW_PREFIX}/bin/elasticsearch</string>
-            <string>--config=#{prefix}/config/elasticsearch.yml</string>
-          </array>
-          <key>EnvironmentVariables</key>
-          <dict>
-            <key>ES_JAVA_OPTS</key>
-            <string>-Xss200000</string>
-          </dict>
-          <key>RunAtLoad</key>
-          <true/>
-          <key>WorkingDirectory</key>
-          <string>#{var}</string>
-          <key>StandardErrorPath</key>
-          <string>/dev/null</string>
-          <key>StandardOutPath</key>
-          <string>/dev/null</string>
-        </dict>
-      </plist>
-    EOS
-  end
 end