IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v2.0.0' into develop

Browse Source
This commit is contained in:
Alexey Safronov 2023-11-10 14:22:44 +04:00
commit 6030200e1e
5 changed files with 240 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

371
config/appsettings.json
View File

@ -76,139 +76,231 @@
}, },
"docservice": { "docservice": {
"coauthor-docs": [ "coauthor-docs": [
".pptx", ".csv",
".ppsx", ".docm",
".xlsx", ".docx",
".csv", ".docxf",
".docx", ".dotm",
".docxf", ".dotx",
".oform", ".oform",
".txt" ".potm",
".potx",
".ppsm",
".pptm",
".ppsx",
".pptx",
".txt",
".xlsm",
".xlsx",
".xltm",
".xltx"
], ],
"commented-docs": [".docx", ".docxf", ".xlsx", ".pptx"], "commented-docs": [
".docm",
".docx",
".docxf",
".dotm",
".dotx",
".potm",
".potx",
".ppsm",
".pptm",
".ppsx",
".pptx",
".xlsm",
".xlsx",
".xltm",
".xltx"
],
"convert-docs": [ "convert-docs": [
".pptm", ".doc",
".ppt", ".dot",
".ppsm", ".dps",
".pps", ".dpt",
".potx", ".epub",
".potm", ".et",
".pot", ".ett",
".odp", ".fb2",
".fodp", ".fodp",
".otp", ".fods",
".xlsm", ".fodt",
".xls", ".htm",
".xltx", ".html",
".xltm", ".mht",
".xlt", ".mhtml",
".ods", ".odp",
".fods", ".ods",
".ots", ".odt",
".docm", ".otp",
".doc", ".ots",
".dotx", ".ott",
".dotm", ".pot",
".dot", ".pps",
".odt", ".ppt",
".fodt", ".rtf",
".ott", ".stw",
".rtf", ".sxc",
".xml" ".sxi",
".sxw",
".wps",
".wpt",
".xls",
".xlsb",
".xlt",
".xml"
], ],
"edited-docs": [ "edited-docs": [
".pptx", ".csv",
".pptm", ".doc",
".ppt", ".docm",
".ppsx", ".docx",
".ppsm", ".docxf",
".pps", ".dot",
".potx", ".dotm",
".potm", ".dotx",
".pot", ".dps",
".odp", ".dpt",
".fodp", ".epub",
".otp", ".et",
".xlsx", ".ett",
".xlsm", ".fb2",
".xls", ".fodp",
".xltx", ".fods",
".xltm", ".fodt",
".xlt", ".htm",
".ods", ".html",
".fods", ".mht",
".ots", ".mhtml",
".csv", ".odp",
".docx", ".ods",
".docxf", ".odt",
".oform", ".oform",
".docm", ".otp",
".doc", ".ots",
".dotx", ".ott",
".dotm", ".pot",
".dot", ".potm",
".odt", ".potx",
".fodt", ".pps",
".ott", ".ppsm",
".txt", ".ppsx",
".rtf", ".ppt",
".mht", ".pptm",
".html", ".pptx",
".htm" ".rtf",
".stw",
".sxc",
".sxi",
".sxw",
".txt",
".wps",
".wpt",
".xls",
".xlsb",
".xlsm",
".xlsx",
".xlt",
".xltm",
".xltx",
".xml"
], ],
"encrypted-docs": [".docx", ".docxf", ".xlsx", ".pptx", ".oform"], "encrypted-docs":
[
".docm",
".docx",
".docxf",
".dotm",
".dotx",
".oform",
".potm",
".potx",
".ppsm",
".pptm",
".ppsx",
".pptx",
".xlsm",
".xlsx",
".xltm",
".xltx"
],
"formfilling-docs": [".oform"], "formfilling-docs": [".oform"],
"customfilter-docs": [".xlsx"], "customfilter-docs":
"reviewed-docs": [".docx", ".docxf"], [
"viewed-docs": [ ".xlsm",
".pptx", ".xlsx",
".pptm", ".xltm",
".ppt", ".xltx"
".ppsx", ],
".ppsm", "reviewed-docs":
".pps", [
".potx", ".docm",
".potm", ".docx",
".pot", ".docxf",
".odp", ".dotm",
".fodp", ".dotx"
".otp", ],
".gslides", "viewed-docs":
".xlsx", [
".xlsm", ".csv",
".xls", ".djvu",
".xltx", ".doc",
".xltm", ".docm",
".xlt", ".docx",
".ods", ".docxf",
".fods", ".dot",
".ots", ".dotm",
".gsheet", ".dotx",
".csv", ".dps",
".docx", ".dpt",
".docxf", ".epub",
".oform", ".et",
".docm", ".ett",
".doc", ".fb2",
".dotx", ".fodp",
".dotm", ".fods",
".dot", ".fodt",
".odt", ".gdoc",
".fodt", ".gsheet",
".ott", ".gslides",
".gdoc", ".htm",
".txt", ".html",
".rtf", ".mht",
".mht", ".mhtml",
".html", ".odp",
".htm", ".ods",
".xml", ".odt",
".fb2", ".oform",
".epub", ".otp",
".pdf", ".ots",
".djvu", ".ott",
".xps", ".oxps",
".oxps" ".pdf",
".pot",
".potm",
".potx",
".pps",
".ppsm",
".ppsx",
".ppt",
".pptm",
".pptx",
".rtf",
".stw",
".sxc",
".sxi",
".sxw",
".txt",
".wps",
".wpt",
".xls",
".xlsb",
".xlsm",
".xlsx",
".xlt",
".xltm",
".xltx",
".xml",
".xps"
], ],
"secret": { "secret": {
"value": "secret", "value": "secret",
@ -257,11 +349,14 @@
], ],
"index": [".pptx", ".xlsx", ".docx"], "index": [".pptx", ".xlsx", ".docx"],
"oform": { "oform": {
"url": "https://cmsoforms.teamlab.info/api/oforms/", "domain": "https://cmsoforms.teamlab.info",
"path": "/api/oforms/",
"ext": ".oform", "ext": ".oform",
"upload": { "upload": {
"url": "https://oforms.teamlab.info/api/upload", "domain": "https://oforms.teamlab.info",
"ext": ".docxf" "path": "/api/upload",
"ext": ".docxf",
"dashboard": "/dashboard/api"
} }
} }
}, },
@ -419,20 +514,24 @@
"style": ["'self'", "'unsafe-inline'"], "style": ["'self'", "'unsafe-inline'"],
"img": ["'self'", "data:", "blob:"], "img": ["'self'", "data:", "blob:"],
"frame": ["'self'"], "frame": ["'self'"],
"fonts": ["'self'", "data:"] "fonts": ["'self'", "data:"],
"connect": ["'self'"],
"media": ["'self'"]
}, },
"zendesk": { "zendesk": {
"def": ["*.zdassets.com", "*.zopim.com", "*.zendesk.com", "wss:"],
"script": ["*.zdassets.com", "*.zopim.com", "'unsafe-eval'"], "script": ["*.zdassets.com", "*.zopim.com", "'unsafe-eval'"],
"img": ["*.zopim.io"] "img": ["*.zopim.io"],
"connect": ["*.zdassets.com", "*.zendesk.com", "*.zopim.com", "wss:"],
"media": ["*.zdassets.com"]
}, },
"firebase": { "firebase": {
"script": ["*.googleapis.com"], "script": ["*.googleapis.com"],
"def": ["*.googleapis.com"] "frame": ["personal-teamlab-guru.firebaseapp.com"],
"connect": ["personal-teamlab-guru.firebaseapp.com", "*.googleapis.com"]
}, },
"oform": { "oform": {
"img": ["static-oforms.teamlab.info"], "img": ["static-oforms.teamlab.info"],
"def": ["cmsoforms.teamlab.info", "oforms.teamlab.info"] "connect": ["cmsoforms.teamlab.info", "oforms.teamlab.info"]
} }
}, },
"logocolors": [ "logocolors": [
@ -473,4 +572,4 @@
"region": "us-east-1" "region": "us-east-1"
} }
} }
} }

3
config/nginx/onlyoffice.conf
View File

@ -94,7 +94,8 @@ server {
set $csp ""; set $csp "";
access_by_lua ' access_by_lua '
if ngx.req.get_method() == "GET" then local accept_header = ngx.req.get_headers()["Accept"]
if ngx.req.get_method() == "GET" and accept_header ~= nil and string.find(accept_header, "html") then
local key = string.format("csp:%s",ngx.var.host) local key = string.format("csp:%s",ngx.var.host)
local redis = require "resty.redis" local redis = require "resty.redis"
local red = redis:new() local red = redis:new()

2
install/common/build-services.py
View File

@ -46,7 +46,7 @@ with open(file_path, 'wb') as open_file:
st = os.stat(file_path) st = os.stat(file_path)
os.chmod(file_path, st.st_mode | stat.S_IEXEC) os.chmod(file_path, st.st_mode | stat.S_IEXEC)
format = "zip" format = "tar"
for service in BACKEND_NODEJS_SERVICES: for service in BACKEND_NODEJS_SERVICES:
print(f"== Build {service} project ==") print(f"== Build {service} project ==")

3
install/win/DocSpace.aip
View File

@ -56,7 +56,6 @@
<ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:3#ExeBuild:7"/> <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:3#ExeBuild:7"/>
<ROW Property="MYSQLODBCDRIVER" Value="MySQL ODBC 8.0 Unicode Driver"/> <ROW Property="MYSQLODBCDRIVER" Value="MySQL ODBC 8.0 Unicode Driver"/>
<ROW Property="Manufacturer" Value="Ascensio System SIA"/> <ROW Property="Manufacturer" Value="Ascensio System SIA"/>
<ROW Property="MsiLogging" MultiBuildValue="DefaultBuild:vp#ExeBuild:vp"/>
<ROW Property="MySQLConnector" Value="MySQL Connector/ODBC 8.0.21 x86"/> <ROW Property="MySQLConnector" Value="MySQL Connector/ODBC 8.0.21 x86"/>
<ROW Property="NEED_REINDEX_ELASTICSEARCH" Value="FALSE" ValueLocId="-"/> <ROW Property="NEED_REINDEX_ELASTICSEARCH" Value="FALSE" ValueLocId="-"/>
<ROW Property="OPEN_INSTALL_CANCEL_URL" Value="1"/> <ROW Property="OPEN_INSTALL_CANCEL_URL" Value="1"/>
@ -1591,7 +1590,7 @@
<ROW PrereqKey="Node.js" DisplayName="Node.js 18.16.1" VersionMin="18.16.0" SetupFileUrl="redist\node-v18.16.1-x64.msi" Location="0" ExactSize="0" Operator="0" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="ym" TargetName="Node.js\node-v18.16.1-x64.msi" Builds="ExeBuild"/> <ROW PrereqKey="Node.js" DisplayName="Node.js 18.16.1" VersionMin="18.16.0" SetupFileUrl="redist\node-v18.16.1-x64.msi" Location="0" ExactSize="0" Operator="0" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="ym" TargetName="Node.js\node-v18.16.1-x64.msi" Builds="ExeBuild"/>
<ROW PrereqKey="OpenResty" DisplayName="OpenResty v1.21.4" VersionMin="1.21.4.2" SetupFileUrl="publish\OpenResty.msi" Location="0" ExactSize="0" Operator="1" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="yxm" TargetName="OpenResty\OpenResty.msi"/> <ROW PrereqKey="OpenResty" DisplayName="OpenResty v1.21.4" VersionMin="1.21.4.2" SetupFileUrl="publish\OpenResty.msi" Location="0" ExactSize="0" Operator="1" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="yxm" TargetName="OpenResty\OpenResty.msi"/>
<ROW PrereqKey="PostgreSQL_ODBC" DisplayName="PostgreSQL ODBC Driver v15.0 x64" SetupFileUrl="psqlodbc_15_x64.msi" 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="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="myx" TargetName="psqlodbc_x64.msi"/> <ROW PrereqKey="PostgreSQL_ODBC" DisplayName="PostgreSQL ODBC Driver v15.0 x64" SetupFileUrl="psqlodbc_15_x64.msi" 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="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="myx" TargetName="psqlodbc_x64.msi"/>
<ROW PrereqKey="PostgresSQL" DisplayName="PostgresSQL 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="xy" TargetName="postgresql-14.0-1-windows-x64.exe"/> <ROW PrereqKey="PostgresSQL" 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="xy" TargetName="postgresql-14.0-1-windows-x64.exe"/>
<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="yx" TargetName="RabbitMQ Server\rabbitmq-server-3.12.1.exe" Builds="ExeBuild"/> <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="yx" TargetName="RabbitMQ Server\rabbitmq-server-3.12.1.exe" Builds="ExeBuild"/>
<ROW PrereqKey="RedisonWindows" DisplayName="Redis 5.0.10 x64" VersionMin="5.0" SetupFileUrl="redist\Redis-x64-5.0.10.msi" 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="/quiet ADD_INSTALLFOLDER_TO_PATH=1" BasicUiComLine="/quiet ADD_INSTALLFOLDER_TO_PATH=1" NoUiComLine="/quiet ADD_INSTALLFOLDER_TO_PATH=1" Options="yx" TargetName="Redis on Windows\Redis-x64-5.0.10.msi" Builds="ExeBuild"/> <ROW PrereqKey="RedisonWindows" DisplayName="Redis 5.0.10 x64" VersionMin="5.0" SetupFileUrl="redist\Redis-x64-5.0.10.msi" 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="/quiet ADD_INSTALLFOLDER_TO_PATH=1" BasicUiComLine="/quiet ADD_INSTALLFOLDER_TO_PATH=1" NoUiComLine="/quiet ADD_INSTALLFOLDER_TO_PATH=1" Options="yx" TargetName="Redis on Windows\Redis-x64-5.0.10.msi" Builds="ExeBuild"/>
<ROW PrereqKey="RequiredApplication" DisplayName="MySQL Connector/ODBC 8.0.33 x86" VersionMin="8.0.33" SetupFileUrl="https://cdn.mysql.com/Downloads/Connector-ODBC/8.0/mysql-connector-odbc-8.0.33-win32.msi" Location="1" ExactSize="0" Operator="1" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="ym" TargetName="MySQL Connector ODBC 8.0.33 x86" Builds="DefaultBuild"/> <ROW PrereqKey="RequiredApplication" DisplayName="MySQL Connector/ODBC 8.0.33 x86" VersionMin="8.0.33" SetupFileUrl="https://cdn.mysql.com/Downloads/Connector-ODBC/8.0/mysql-connector-odbc-8.0.33-win32.msi" Location="1" ExactSize="0" Operator="1" ComLine="/quiet" BasicUiComLine="/quiet" NoUiComLine="/quiet" Options="ym" TargetName="MySQL Connector ODBC 8.0.33 x86" Builds="DefaultBuild"/>

2
install/win/build-batch.bat
View File

@ -55,7 +55,7 @@ del /f /q buildtools\install\win\Files\config\*.dev.json
%sed% "s_\(\"samesite\":\).*,_\1 \"None\",_g" -i buildtools\install\win\Files\config\appsettings.json %sed% "s_\(\"samesite\":\).*,_\1 \"None\",_g" -i buildtools\install\win\Files\config\appsettings.json
::redirectUrl value replacement ::redirectUrl value replacement
%sed% "s/teamlab.info/onlyoffice.com/g" -i buildtools\install\win\Files\config/autofac.consumers.json %sed% "s/teamlab.info/onlyoffice.com/g" -i buildtools\install\win\Files\config\autofac.consumers.json
%sed% "s_\(\"wrongPortalNameUrl\":\).*,_\1 \"\",_g" -i buildtools\install\win\Files\public\scripts\config.json %sed% "s_\(\"wrongPortalNameUrl\":\).*,_\1 \"\",_g" -i buildtools\install\win\Files\public\scripts\config.json
REM echo ######## Remove AWSTarget from nlog.config ######## REM echo ######## Remove AWSTarget from nlog.config ########