From 8668479b92f28e2d3ef1a55a2095ac515cb7b719 Mon Sep 17 00:00:00 2001 From: David Pilato Date: Wed, 21 Aug 2013 16:06:30 +0200 Subject: [PATCH] Plugin Manager can not download _site plugins from github Sounds like github changes a bit download url for master zip file. From `https://github.com/username/reponame/zipball/master` to `https://codeload.github.com/username/reponame/zip/master`. We need to update plugin manager to reflect that change. In the meantime, we invite users having this issue to use: ```sh bin/plugin -install reponame -url https://codeload.github.com/username/reponame/zip/master ``` For example: ```sh bin/plugin -install paramedic -url https://codeload.github.com/karmi/elasticsearch-paramedic/zip/master ``` Closes #3551 --- .../org/elasticsearch/plugins/PluginManager.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/elasticsearch/plugins/PluginManager.java b/src/main/java/org/elasticsearch/plugins/PluginManager.java index 6dd55ab43e7..90537d7962f 100644 --- a/src/main/java/org/elasticsearch/plugins/PluginManager.java +++ b/src/main/java/org/elasticsearch/plugins/PluginManager.java @@ -28,6 +28,10 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.node.internal.InternalSettingsPerparer; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -36,11 +40,6 @@ import java.util.Enumeration; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; - import static org.elasticsearch.common.settings.ImmutableSettings.Builder.EMPTY_SETTINGS; /** @@ -179,7 +178,7 @@ public class PluginManager { } if (!downloaded) { // try it as a site plugin tagged - pluginUrl = new URL("https://github.com/" + userName + "/" + repoName + "/zipball/v" + version); + pluginUrl = new URL("https://codeload.github.com/" + userName + "/" + repoName + "/zip/v" + version); System.out.println("Trying " + pluginUrl.toExternalForm() + "... (assuming site plugin)"); try { downloadHelper.download(pluginUrl, pluginFile, new HttpDownloadHelper.VerboseProgress(System.out)); @@ -193,7 +192,7 @@ public class PluginManager { } } else { // assume site plugin, download master.... - URL pluginUrl = new URL("https://github.com/" + userName + "/" + repoName + "/zipball/master"); + URL pluginUrl = new URL("https://codeload.github.com/" + userName + "/" + repoName + "/zip/master"); System.out.println("Trying " + pluginUrl.toExternalForm() + "... (assuming site plugin)"); try { downloadHelper.download(pluginUrl, pluginFile, new HttpDownloadHelper.VerboseProgress(System.out));