update to upstream release 6.3.0 (OSS flavor)

rgl · Jun 16, 2018 · 6284c8e · 6284c8e
1 parent d988416
commit 6284c8e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 X64?= false
 
-ES_FILE_VERSION=6.2.4
+ES_FILE_VERSION=6.3.0
 ES_VERSION=$(ES_FILE_VERSION)
-ES_SHA512=f9e261f1cd394342b78d15fa2b54124bf679642fd3fcf7c976b8c37afa340d41085cf00301a7624a54164e9478ae16bf9e1ae62997a6725688b38e0bd2586e30
+ES_SHA512=f28287021694177bed6ee5a59c4d75a010a3ce3521d0f91bf13971e3f2565d496ee9163a46a769430ecd7716404d781466e2b64101770b956fb2d10424210c45
 ES_NAME=elasticsearch-$(ES_VERSION)
 ES_HOME=vendor/$(ES_NAME)
 ES_LIB=$(ES_HOME)/lib
@@ -83,7 +83,7 @@ $(ES_SERVICE_EXE): $(COMMONS_DAEMON_PRUNSRV) $(SETEXECUTABLEICON_EXE)
 	mv $(ES_SERVICE_EXE).tmp $(ES_SERVICE_EXE)
 
 $(ES_JAR):
-	wget -qO $(ES_HOME).zip https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$(ES_VERSION).zip
+	wget -qO $(ES_HOME).zip https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-$(ES_VERSION).zip
 	[ `openssl sha512 $(ES_HOME).zip | awk '{print $$2}'` == $(ES_SHA512) ]
 	rm -rf vendor-tmp && mkdir vendor-tmp
 	unzip -q -d vendor-tmp $(ES_HOME).zip

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Elasticsearch Setup
 
-This is a setup application for installing [Elasticsearch](https://www.elastic.co/products/elasticsearch)
+This is a setup application for installing [Elasticsearch (OSS flavor)](https://www.elastic.co/products/elasticsearch)
 on a Windows machine.
 
 The setup will:
@@ -17,6 +17,7 @@ The setup will:
 
  * grant the `elasticsearch` account:
      * read permissions to the `config` directory.
+     * full permissions to the `config/elasticsearch.keystore` file.
      * full permissions to the `data` and `logs` directories.
 
  * create a bunch of Start Menu entries (link to home page, guide, etc).

diff --git a/Vagrantfile-provision.ps1 b/Vagrantfile-provision.ps1
@@ -217,7 +217,7 @@ Start-Process `
 # install plugins.
 function Install-ElasticsearchPlugin($name) {
     Write-Output "Installing the $name Elasticsearch plugin..."
-    cmd /C "call ""C:\Program Files\Elasticsearch\bin\elasticsearch-plugin.bat"" install --silent $name"
+    cmd /C "call ""C:\Program Files\Elasticsearch\bin\elasticsearch-plugin.bat"" install --batch $name"
     if ($LASTEXITCODE) {
         throw "failed to install Elasticsearch plugin $name with exit code $LASTEXITCODE"
     }

diff --git a/elasticsearch.iss b/elasticsearch.iss
@@ -90,6 +90,8 @@ Name: "{group}\Uninstall Elasticsearch"; Filename: "{uninstallexe}"
 Filename: "{tmp}\SetACL.exe"; Parameters: "-on config -ot file -actn setprot -op ""dacl:p_nc;sacl:p_nc"" -actn ace -ace ""n:Administrators;p:full"" -ace ""n:{#ServiceAccountName};p:read"""; WorkingDir: "{app}"; Flags: runhidden;
 Filename: "{tmp}\SetACL.exe"; Parameters: "-on data -ot file -actn setprot -op ""dacl:p_nc;sacl:p_nc"" -actn ace -ace ""n:Administrators;p:full"" -ace ""n:{#ServiceAccountName};p:full"""; WorkingDir: "{app}"; Flags: runhidden;
 Filename: "{tmp}\SetACL.exe"; Parameters: "-on logs -ot file -actn setprot -op ""dacl:p_nc;sacl:p_nc"" -actn ace -ace ""n:Administrators;p:full"" -ace ""n:{#ServiceAccountName};p:full"""; WorkingDir: "{app}"; Flags: runhidden;
+Filename: "{app}\bin\elasticsearch-keystore.bat"; Parameters: "create"; WorkingDir: "{app}"; Flags: runhidden shellexec waituntilterminated;
+Filename: "{tmp}\SetACL.exe"; Parameters: "-on config/elasticsearch.keystore -ot file -actn setprot -op ""dacl:p_nc;sacl:p_nc"" -actn ace -ace ""n:Administrators;p:full"" -ace ""n:{#ServiceAccountName};p:full"""; WorkingDir: "{app}"; Flags: runhidden;
 Filename: "{app}\lib\elasticsearchw-update.cmd"; WorkingDir: "{app}"; Flags: runhidden shellexec waituntilterminated;
 
 [UninstallRun]

diff --git a/elasticsearchw-update.cmd b/elasticsearchw-update.cmd
@@ -87,6 +87,7 @@ if exist "%ES_HOME%\jre\bin\client\jvm.dll" set JVM=%ES_HOME%\jre\bin\client\jvm
   --StartMode jvm ^
   --StartClass org.elasticsearch.bootstrap.Elasticsearch ^
   --StartMethod main ^
+  --StartParams --quiet ^
   --StopMode jvm ^
   --StopClass org.elasticsearch.bootstrap.Elasticsearch ^
   --StopMethod close ^
@@ -95,7 +96,9 @@ if exist "%ES_HOME%\jre\bin\client\jvm.dll" set JVM=%ES_HOME%\jre\bin\client\jvm
   --JvmMx %JVM_MX% ^
   %JVM_OPTIONS: = ++JvmOptions % ^
   ++JvmOptions "-Des.path.home=%ES_HOME%" ^
-  ++JvmOptions "-Des.path.conf=%ES_HOME%\config"
+  ++JvmOptions "-Des.path.conf=%ES_HOME%\config" ^
+  ++JvmOptions "-Des.distribution.flavor=oss" ^
+  ++JvmOptions "-Des.distribution.type=zip"
 
 rem These settings are saved in the Windows Registry at:
 rem