Update OpenSearch to version 2.18.0 in win

ONLYOFFICE · Jan 13, 2025 · beb4dd3 · beb4dd3
1 parent d9ae2f4
commit beb4dd3
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/install/win/DocSpace.Prerequisites.aip b/install/win/DocSpace.Prerequisites.aip
@@ -87,7 +87,7 @@
     <ROW Feature="MySQLInstallerRunn" Feature_Parent="MySQLInstaller" Title="MySQL Installer Community 8.0.37 x86 Runner" Description="MySQL Installer Community 8.0.37 x86 Runner" Display="3" Level="4" Attributes="0"/>
     <ROW Feature="Node.js" Title="Node.js 20.11.1" Description="Node.js 20.11.1" Display="21" Level="4" Attributes="16"/>
     <ROW Feature="OpenResty" Title="OpenResty v1.27.1.1" Description="OpenResty v1.27.1.1" Display="41" Level="4" Attributes="16"/>
-    <ROW Feature="OpenSearch" Title="OpenSearch v2.11.1 x64" Description="OpenSearch v2.11.1 x64" Display="25" Level="4" Attributes="0"/>
+    <ROW Feature="OpenSearch" Title="OpenSearch v2.18.0 x64" Description="OpenSearch v2.18.0 x64" Display="25" Level="4" Attributes="0"/>
     <ROW Feature="OpenSearchStack" Title="OpenSearchStack v1.5.0 x64" Description="OpenSearchStack v1.5.0 x64" Display="43" Level="4" Attributes="0"/>
     <ROW Feature="PostgreSQL" Title="PostgreSQL v14.0 x64" Description="PostgreSQL v14.0 x64" Display="39" Level="4" Attributes="0"/>
     <ROW Feature="RabbitMQServer" Title="RabbitMQ v3.12.1 x64" Description="RabbitMQ v3.12.1 x64" Display="29" Level="4" Attributes="0"/>
@@ -496,7 +496,7 @@
     <ROW PrereqKey="MySQLInstallerRunn" DisplayName="MySQL Installer Community 8.0.37 x86 Runner" SetupFileUrl="MySQL Installer Runner.exe" Location="0" ExactSize="0" Operator="1" ComLine="/VERYSILENT /DB_PWD=&quot;root&quot; /MYSQL_VERSION=&quot;8.0.37&quot;" BasicUiComLine="/VERYSILENT /DB_PWD=&quot;root&quot; /MYSQL_VERSION=&quot;8.0.37&quot;" NoUiComLine="/VERYSILENT /DB_PWD=&quot;root&quot; /MYSQL_VERSION=&quot;8.0.37&quot;" Options="xf" TargetName="MySQL Installer Runner                                      \MySQL Installer Runner.exe" Feature="MySQLInstallerRunn"/>
     <ROW PrereqKey="Node.js" DisplayName="Node.js 20.11.1" VersionMin="20.11.1" SetupFileUrl="redist\node-v20.11.1-x64.msi" Location="0" ExactSize="0" Operator="0" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="fm" TargetName="Node.js\node-v20.11.1-x64.msi" Feature="Node.js"/>
     <ROW PrereqKey="OpenResty" DisplayName="OpenResty v1.27.1.1" VersionMin="1.27.1.1" SetupFileUrl="publish\OpenResty-1.27.1.1.msi" Location="0" ExactSize="0" Operator="1" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="xfm" TargetName="OpenResty\OpenResty-1.27.1.1.msi" Feature="OpenResty"/>
-    <ROW PrereqKey="OpenSearch" DisplayName="OpenSearch v2.11.1 x64" VersionMin="2.11.1" SetupFileUrl="publish\OpenSearch-2.11.1.exe" Location="0" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="/exenoui /qn" BasicUiComLine="/exenoui /qn" NoUiComLine="/exenoui /qn" Options="f" TargetName="OpenSearch 2.11.1\OpenSearch-2.11.1.exe" Feature="OpenSearch"/>
+    <ROW PrereqKey="OpenSearch" DisplayName="OpenSearch v2.18.0 x64" VersionMin="2.18.0" SetupFileUrl="publish\OpenSearch-2.18.0.exe" Location="0" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="/exenoui /qn" BasicUiComLine="/exenoui /qn" NoUiComLine="/exenoui /qn" Options="f" TargetName="OpenSearch 2.18.0\OpenSearch-2.18.0.exe" Feature="OpenSearch"/>
     <ROW PrereqKey="OpenSearchStack" DisplayName="OpenSearchStack v1.5.0 x64" VersionMin="1.5.0" SetupFileUrl="publish\OpenSearchStack.msi" Location="0" ExactSize="0" Operator="1" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="f" TargetName="OpenSearchStack\OpenSearchStack.msi" Feature="OpenSearchStack"/>
     <ROW PrereqKey="PostgreSQL" DisplayName="PostgreSQL v14.0 x64" VersionMin="14.0" SetupFileUrl="postgresql-14.0-1-windows-x64.exe" Location="0" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="--unattendedmodeui none --install_runtimes 0 --mode unattended --superaccount &quot;postgres&quot; --superpassword &quot;postgres&quot;" BasicUiComLine="--unattendedmodeui none --install_runtimes 0 --mode unattended --superaccount &quot;postgres&quot; --superpassword &quot;postgres&quot;" NoUiComLine="--unattendedmodeui none --install_runtimes 0 --mode unattended --superaccount &quot;postgres&quot; --superpassword &quot;postgres&quot;" Options="xf" TargetName="postgresql-14.0-1-windows-x64.exe" Feature="PostgreSQL"/>
     <ROW PrereqKey="RabbitMQServer" DisplayName="RabbitMQ v3.12.1 x64" VersionMin="3.12" SetupFileUrl="redist\rabbitmq-server-3.12.1.exe" Location="0" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="/S" BasicUiComLine="/S" NoUiComLine="/S" Options="xf" TargetName="RabbitMQ Server\rabbitmq-server-3.12.1.exe" Feature="RabbitMQServer"/>
@@ -515,7 +515,7 @@
     <ROW SearchKey="UpgradeCode" Prereq="MySQLConnectorODBC" SearchType="4" SearchString="{7AEDB3F3-7B9D-4FE2-8D8F-3CE3DE6F5B6B}" VerMin="8.0.37" Order="1" Property="PreReqSearch_8"/>
     <ROW SearchKey="UpgradeCode_1" Prereq="MySQLInstaller" SearchType="4" SearchString="{18B94B70-06F1-4AC0-B308-37280DB868C2}" VerMin="1.6.10.0" Order="1" Property="PreReqSearch_9"/>
     <ROW SearchKey="UpgradeCode_2" Prereq="Node.js" SearchType="4" SearchString="{47C07A3A-42EF-4213-A85D-8F5A59077C28}" VerMin="20.11.1" Order="1" Property="PreReqSearch_10"/>
-    <ROW SearchKey="UpgradeCode_3" Prereq="OpenSearch" SearchType="4" SearchString="{F8561DF7-6238-4927-8DAC-AD0EBC117F6C}" VerMin="2.11.1" Order="2" Property="PreReqSearch_16"/>
+    <ROW SearchKey="UpgradeCode_3" Prereq="OpenSearch" SearchType="4" SearchString="{F8561DF7-6238-4927-8DAC-AD0EBC117F6C}" VerMin="2.18.0" Order="2" Property="PreReqSearch_16"/>
     <ROW SearchKey="UpgradeCode_4" Prereq="RedisonWindows" SearchType="4" SearchString="{05410198-7212-4FC4-B7C8-AFEFC3DA0FBC}" VerMin="7.4.0" Order="1" Property="PreReqSearch_15"/>
     <ROW SearchKey="UpgradeCode_5" Prereq="FFmpegEssentials" SearchType="4" SearchString="{384A74EC-865A-4907-8561-9DE765EE6E14}" VerMin="6.0.0.20230306" Order="1" Property="PreReqSearch_19"/>
     <ROW SearchKey="UpgradeCode_6" Prereq="psqlODBC_x64" SearchType="4" SearchString="{BBD29DF5-89F6-4B8B-BDC9-C3EA3A4AFDBB}" VerMin="15.00.0000" Order="1" Property="PreReqSearch_20"/>

diff --git a/install/win/DocSpace.aip b/install/win/DocSpace.aip
@@ -1557,7 +1557,7 @@
     <ROW PrereqKey="MySQLInstallerRunn" DisplayName="MySQL Installer Community 8.0.37 x86 Runner" SetupFileUrl="MySQL Installer Runner.exe" Location="0" ExactSize="0" Operator="1" ComLine="/VERYSILENT /DB_PWD=&quot;root&quot; /MYSQL_VERSION=&quot;8.0.37&quot;" BasicUiComLine="/VERYSILENT /DB_PWD=&quot;root&quot; /MYSQL_VERSION=&quot;8.0.37&quot;" NoUiComLine="/VERYSILENT /DB_PWD=&quot;root&quot; /MYSQL_VERSION=&quot;8.0.37&quot;" Options="yx" TargetName="MySQL Installer Runner                                      \MySQL Installer Runner.exe" ParentPrereq="RequiredApplication_2"/>
     <ROW PrereqKey="OpenJDK_Java_Development" DisplayName="OpenJDK Java Development Kit 21" VersionMin="21.0" SetupFileUrl="https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.msi" Location="1" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="/qn" BasicUiComLine="/qn" NoUiComLine="/qn" Options="ymx" TargetName="OpenJDK_Java_Development"/>
     <ROW PrereqKey="OpenResty" DisplayName="OpenResty v1.27.1.1" VersionMin="1.27.1.1" SetupFileUrl="publish\OpenResty-1.27.1.1.msi" Location="0" ExactSize="0" Operator="1" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="yxm" TargetName="OpenResty\OpenResty-1.27.1.1.msi"/>
-    <ROW PrereqKey="OpenSearch2.11.1" DisplayName="OpenSearch v2.11.1 x64" VersionMin="2.11.1" SetupFileUrl="publish\OpenSearch-2.11.1.exe" Location="0" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="/exenoui /qn" BasicUiComLine="/exenoui /qn" NoUiComLine="/exenoui /qn" Options="y" TargetName="OpenSearch 2.11.1\OpenSearch-2.11.1.exe"/>
+    <ROW PrereqKey="OpenSearch2.18.0" DisplayName="OpenSearch v2.18.0 x64" VersionMin="2.18.0" SetupFileUrl="publish\OpenSearch-2.18.0.exe" Location="0" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="/exenoui /qn" BasicUiComLine="/exenoui /qn" NoUiComLine="/exenoui /qn" Options="y" TargetName="OpenSearch 2.18.0\OpenSearch-2.18.0.exe"/>
     <ROW PrereqKey="OpenSearchStack" DisplayName="OpenSearchStack v1.5.0 x64" VersionMin="1.5.0" SetupFileUrl="publish\OpenSearchStack.msi" Location="0" ExactSize="0" Operator="1" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="y" TargetName="OpenSearchStack\OpenSearchStack.msi"/>
     <ROW PrereqKey="PostgreSQL_ODBC" DisplayName="PostgreSQL ODBC Driver v15.0 x64" SetupFileUrl="http://download.onlyoffice.com/install/windows/redist/psqlodbc_15_x64.msi" Location="1" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="myx" TargetName="PostgreSQL ODBC Driver v15.0 x64"/>
     <ROW PrereqKey="PostgresSQL" DisplayName="PostgreSQL v14.0 x64" VersionMin="14.0" SetupFileUrl="https://get.enterprisedb.com/postgresql/postgresql-14.0-1-windows-x64.exe" Location="1" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="--unattendedmodeui none --install_runtimes 0 --mode unattended --superaccount &quot;postgres&quot; --superpassword &quot;postgres&quot;" BasicUiComLine="--unattendedmodeui none --install_runtimes 0 --mode unattended --superaccount &quot;postgres&quot; --superpassword &quot;postgres&quot;" NoUiComLine="--unattendedmodeui none --install_runtimes 0 --mode unattended --superaccount &quot;postgres&quot; --superpassword &quot;postgres&quot;" Options="xy" TargetName="PostgreSQL v14.0 x64"/>
@@ -1566,7 +1566,7 @@
     <ROW PrereqKey="RequiredApplication_2" DisplayName="MySQL Installer Community 8.0.37 x86" VersionMin="1.6.6.0" SetupFileUrl="https://cdn.mysql.com/Downloads/MySQLInstaller/mysql-installer-community-8.0.37.0.msi" Location="1" ExactSize="0" Operator="1" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="y" TargetName="MySQL Installer Community 8.0.37 x86"/>
     <ROW PrereqKey="RequiredApplication_5" DisplayName="RabbitMQ v3.12.1 x64" VersionMin="3.12" SetupFileUrl="https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.12.1/rabbitmq-server-3.12.1.exe" Location="1" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="/S" BasicUiComLine="/S" NoUiComLine="/S" Options="yx" TargetName="RabbitMQ v3.12.1 x64"/>
     <ROW PrereqKey="RequiredApplication_6" DisplayName="Redis 7.4.0 x64" VersionMin="7.4.0" SetupFileUrl="https://github.com/ONLYOFFICE/redis-windows/releases/download/7.4.0/Redis-7.4.0-Windows-x64.msi" Location="1" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="/quiet ADD_INSTALLFOLDER_TO_PATH=1" BasicUiComLine="/quiet ADD_INSTALLFOLDER_TO_PATH=1" NoUiComLine="/quiet ADD_INSTALLFOLDER_TO_PATH=1" Options="yx" TargetName="Redis 7.4.0 x64"/>
-    <ATTRIBUTE name="PrereqsOrder" value="B96F93FA27E74B02866727AAE83982D0 F3520F64DA5998338D97129FAD2 EA5B60A5CAD4115A8386D017CC889B9 CA62D813A4E74FA2AAE86A7D7B7B1493 A918597FE054CCCB65ABDBA0AD8F63C C4FE6FD5B7C4D07B3A313E754A9A6A8 RequiredApplication RequiredApplication_2 MySQLInstallerRunn RequiredApplication_1 OpenJDK_Java_Development OpenSearch2.11.1 Erlangv26.0x64 RequiredApplication_5 RequiredApplication_6 FFmpegx64 Certbot PostgreSQL_ODBC PostgresSQL OpenResty OpenSearchStack DocumentServer DocumentServer.EE DocumentServer.DE"/>
+    <ATTRIBUTE name="PrereqsOrder" value="B96F93FA27E74B02866727AAE83982D0 F3520F64DA5998338D97129FAD2 EA5B60A5CAD4115A8386D017CC889B9 CA62D813A4E74FA2AAE86A7D7B7B1493 A918597FE054CCCB65ABDBA0AD8F63C C4FE6FD5B7C4D07B3A313E754A9A6A8 RequiredApplication RequiredApplication_2 MySQLInstallerRunn RequiredApplication_1 OpenJDK_Java_Development OpenSearch2.18.0 Erlangv26.0x64 RequiredApplication_5 RequiredApplication_6 FFmpegx64 Certbot PostgreSQL_ODBC PostgresSQL OpenResty OpenSearchStack DocumentServer DocumentServer.EE DocumentServer.DE"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
     <ROW SearchKey="A918597FE054CCCB65ABDBA0AD8F63CSyst" Prereq="A918597FE054CCCB65ABDBA0AD8F63C" SearchType="0" SearchString="[SystemFolder]vcruntime140.dll" VerMin="14.26.28720" Order="2" Property="PreReqSearch_A918597FE054CCCB65ABDB"/>
@@ -1590,7 +1590,7 @@
     <ROW SearchKey="UpgradeCode" Prereq="PostgreSQL_ODBC" SearchType="4" SearchString="{BBD29DF5-89F6-4B8B-BDC9-C3EA3A4AFDBB}" VerMin="15.0" Order="1" Property="PreReqSearch_14"/>
     <ROW SearchKey="UpgradeCode_1" Prereq="OpenSearchStack" SearchType="4" SearchString="{93CD82F0-18A5-4803-AC50-9A0021E92A56}" VerMin="1.5.0" Order="1" Property="PreReqSearch_7"/>
     <ROW SearchKey="UpgradeCode_3" Prereq="RequiredApplication_6" SearchType="4" SearchString="{05410198-7212-4FC4-B7C8-AFEFC3DA0FBC}" VerMin="7.4.0" Order="2" Property="PreReqSearch_12"/>
-    <ROW SearchKey="UpgradeCode_8" Prereq="OpenSearch2.11.1" SearchType="4" SearchString="{F8561DF7-6238-4927-8DAC-AD0EBC117F6C}" VerMin="2.11.1" Order="1" Property="PreReqSearch_29"/>
+    <ROW SearchKey="UpgradeCode_8" Prereq="OpenSearch2.18.0" SearchType="4" SearchString="{F8561DF7-6238-4927-8DAC-AD0EBC117F6C}" VerMin="2.18.0" Order="1" Property="PreReqSearch_29"/>
     <ROW SearchKey="Version" Prereq="MySQLInstallerRunn" SearchType="2" SearchString="HKLM\SOFTWARE\MySQL AB\MySQL Server 5.7\Version" Order="1" Property="PreReqSearch_4"/>
     <ROW SearchKey="Version_1" Prereq="MySQLInstallerRunn" SearchType="2" SearchString="HKLM\SOFTWARE\MySQL AB\MySQL Server 8.0\Version" Order="2" Property="PreReqSearch_5"/>
     <ROW SearchKey="Version_2" Prereq="MySQLInstallerRunn" SearchType="2" SearchString="HKLM\SOFTWARE\MySQL AB\MySQL Server 5.5\Version" VerMin="5.5" Order="0" Property="PreReqSearch_6"/>

diff --git a/install/win/OpenSearch.aip b/install/win/OpenSearch.aip
@@ -11,10 +11,10 @@
     <ROW Property="ARPNOREPAIR" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="Manufacturer" Value="Ascensio System SIA"/>
     <ROW Property="PACKAGE_NAME" Value="[|ProductName]-[|ProductVersion]"/>
-    <ROW Property="ProductCode" Value="1033:{5D3E60C0-55B7-4680-97C2-B52C4509753F} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{1296DFEF-260F-46F1-B0EB-200047DBAC2D} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="OpenSearch"/>
-    <ROW Property="ProductVersion" Value="2.11.1" Options="32"/>
+    <ROW Property="ProductVersion" Value="2.18.0" Options="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="ServiceName_OpenSearch" Value="OpenSearch"/>
     <ROW Property="UpgradeCode" Value="{F8561DF7-6238-4927-8DAC-AD0EBC117F6C}"/>

diff --git a/install/win/build-batch.bat b/install/win/build-batch.bat
@@ -1,7 +1,7 @@
 REM echo ######## Set variables ########
 set "publisher="Ascensio System SIA""
 set "nuget="%cd%\buildtools\install\win\nuget.exe""
-set "opensearch_version=2.11.1"
+set "opensearch_version=2.18.0"
 set "openresty_version=1.27.1.1"
 
 REM echo ######## Extracting and preparing files to build ########

diff --git a/install/win/build-download-prereq.ps1 b/install/win/build-download-prereq.ps1
@@ -63,7 +63,7 @@ $path_prereq = "${pwd}\buildtools\install\win\"
 
 $opensearchstack_path = "${pwd}\buildtools\install\win\OpenSearchStack\"
 
-$opensearch_version = '2.11.1'
+$opensearch_version = '2.18.0'
 
 $opensearchdashboards_version = '2.18.0'
 

diff --git a/install/win/tools/OpenSearch.xml b/install/win/tools/OpenSearch.xml
@@ -6,6 +6,7 @@
 	<startmode>Automatic</startmode>
 	<delayedAutoStart>true</delayedAutoStart>
 	<onfailure action="restart" delay="1 sec"/>
+	<env name="OPENSEARCH_INITIAL_ADMIN_PASSWORD" value="onlyoffice!A1" />
 	<logpath>%BASE%\..\Log\</logpath>
 	<workingdirectory>%BASE%\..\</workingdirectory>
 	<executable>%BASE%\..\opensearch-windows-install.bat</executable>

diff --git a/install/win/utils.ps1 b/install/win/utils.ps1
@@ -271,7 +271,7 @@ function SetDashboardsPwd {
 # Function to set up OpenSearch.
 function OpenSearchSetup {
     $AppDir = AI_GetMsiProperty APPDIR
-    $AppIndexDir = Join-Path $AppDir "Data\Index\v2.11.1\"
+    $AppIndexDir = Join-Path $AppDir "Data\Index\v2.18.0\"
     $LogsDir     = Join-Path $AppDir "Logs\"
     $OpenSearchDashboardsYml = "C:\OpenSearchStack\opensearch-dashboards-2.18.0\config\opensearch_dashboards.yml"