diff --git a/install/win/DocSpace.aip b/install/win/DocSpace.aip
index 789084540e..bb98a5efcd 100644
--- a/install/win/DocSpace.aip
+++ b/install/win/DocSpace.aip
@@ -33,6 +33,7 @@
+
@@ -516,6 +517,7 @@
+
@@ -1040,6 +1042,7 @@
+
@@ -1287,6 +1290,7 @@
+
@@ -1325,6 +1329,7 @@
+
@@ -1345,6 +1350,7 @@
+
@@ -1587,6 +1593,7 @@
+
@@ -1594,7 +1601,8 @@
-
+
+
diff --git a/install/win/build-batch.bat b/install/win/build-batch.bat
index 488263b5a5..c1d795b548 100644
--- a/install/win/build-batch.bat
+++ b/install/win/build-batch.bat
@@ -50,6 +50,7 @@ copy "buildtools\install\docker\config\nginx\onlyoffice-proxy.conf" "buildtools\
copy "buildtools\install\docker\config\nginx\onlyoffice-proxy-ssl.conf" "buildtools\install\win\Files\nginx\conf\onlyoffice-proxy-ssl.conf.tmpl" /y
copy "buildtools\install\docker\config\nginx\letsencrypt.conf" "buildtools\install\win\Files\nginx\conf\includes\letsencrypt.conf" /y
copy "buildtools\install\win\sbin\docspace-ssl-setup.ps1" "buildtools\install\win\Files\sbin\docspace-ssl-setup.ps1" /y
+copy "buildtools\install\docker\config\fluent-bit.conf" "buildtools\install\win\Files\config\fluent-bit.conf" /y
rmdir buildtools\install\win\publish /s /q
REM echo ######## SSL configs ########
@@ -59,6 +60,13 @@ REM echo ######## SSL configs ########
%sed% -i "s/ssl_dhparam \/etc\/ssl\/certs\/dhparam.pem;/#ssl_dhparam \/etc\/ssl\/certs\/dhparam.pem;/" buildtools\install\win\Files\nginx\conf\onlyoffice-proxy-ssl.conf.tmpl
%sed% -i "s_\(.*root\).*;_\1 \"{APPDIR}letsencrypt\";_g" -i buildtools\install\win\Files\nginx\conf\includes\letsencrypt.conf
%sed% -i "s#/etc/nginx/html#conf/html#g" buildtools\install\win\Files\nginx\conf\onlyoffice.conf
+%sed% -i "s/\/etc\/nginx\/\.htpasswd_dashboards/\.htpasswd_dashboards/g" buildtools\install\win\Files\nginx\conf\onlyoffice.conf
+
+REM echo ######## Configure fluent-bit config for windows ########
+%sed% -i "s/forward/tail/" buildtools\install\win\Files\config\fluent-bit.conf
+%sed% -i "s/Port/Path/" buildtools\install\win\Files\config\fluent-bit.conf
+%sed% -i "s/24224/{APPDIR}Logs\*.log/" buildtools\install\win\Files\config\fluent-bit.conf
+%sed% -i "/Listen\s*127\.0\.0\.1/d" buildtools\install\win\Files\config\fluent-bit.conf
REM echo ######## Delete test and dev configs ########
del /f /q buildtools\install\win\Files\config\*.test.json
diff --git a/install/win/utils.vbs b/install/win/utils.vbs
index 5ab8e307c2..71f1241e21 100644
--- a/install/win/utils.vbs
+++ b/install/win/utils.vbs
@@ -118,6 +118,13 @@ Function SetDocumentServerJWTSecretProp
End Function
+Function SetDashboardsPwd
+ On Error Resume Next
+
+ Session.Property("DASHBOARDS_PWD") = RandomString( 20 )
+
+End Function
+
Function SetMACHINEKEY
On Error Resume Next
@@ -393,7 +400,21 @@ Function OpenSearchSetup
oRE.Pattern = "opensearch.hosts:.*"
fileContent = oRE.Replace(fileContent, "opensearch.hosts: [http://localhost:9200]")
End if
-
+
+ If InStrRev(fileContent, "server.host") = 0 Then
+ fileContent = fileContent & Chr(13) & Chr(10) & "server.host: 127.0.0.1"
+ Else
+ oRE.Pattern = "server.host:.*"
+ fileContent = oRE.Replace(fileContent, "server.host: 127.0.0.1")
+ End if
+
+ If InStrRev(fileContent, "server.basePath") = 0 Then
+ fileContent = fileContent & Chr(13) & Chr(10) & "server.basePath: /dashboards"
+ Else
+ oRE.Pattern = "server.basePath:.*"
+ fileContent = oRE.Replace(fileContent, "server.basePath: /dashboards")
+ End if
+
Set objFile = objFSO.OpenTextFile(OPENSEARCH_DASHBOARDS_YML, ForWriting)
objFile.WriteLine fileContent
@@ -548,7 +569,7 @@ Function MoveConfigs
configSslFile = targetFolder & "\onlyoffice-proxy-ssl.conf.tmpl"
configFile = targetFolder & "\onlyoffice-proxy.conf"
sslScriptPath = Session.Property("APPDIR") & "sbin\docspace-ssl-setup.ps1"
- FluentBitSourceFile = Session.Property("APPDIR") & "fluent-bit.conf"
+ FluentBitSourceFile = Session.Property("APPDIR") & "config\fluent-bit.conf"
FluentBitDstFolder = "C:\OpenSearchStack\fluent-bit-2.2.2-win64\conf\"
' Read content and extract SSL certificate and key paths if it exists