Skip to content

Commit

Permalink
Update to 11.5.2 (#304)
Browse files Browse the repository at this point in the history
  • Loading branch information
Anton Rychenkov authored Jul 12, 2021
1 parent 5e4fa34 commit 4ac38fa
Show file tree
Hide file tree
Showing 3,172 changed files with 781,745 additions and 179 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 0 additions & 4 deletions build/config/TeamLabSvc.exe.config
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,6 @@
<scheduler name="CRM" register="ASC.Web.CRM.Configuration.ProductEntryPoint.RegisterSendMethods, ASC.Web.CRM" />
</schedulers>
</notify>
<backup>
<cleaner />
<scheduler />
</backup>
<feed aggregatePeriod="0:3:0" />
<autoreply mailFolder="..\..\Logs\" />
<socketio path="..\ASC.Socket.IO" port="9899">
Expand Down
33 changes: 33 additions & 0 deletions build/install/deb/Files/god/conf.d/services.god
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
dictionary = { "teamlabNotify" => 9811, "teamlabBackup" => 9812, "teamlabIndex" => 9813, "teamlabStorageMigrate" => 9814, "teamlabTelegram" => 9815, "teamlabStorageEncryption" => 9816, "teamlabThumbnailBuilder" => 9817, "teamlabMailCleaner" => 9819, "teamlabMailWatchdog" => 9818, "teamlabFeed" => 9808 };

%w{Notify Backup Index StorageMigrate Telegram StorageEncryption ThumbnailBuilder MailCleaner MailWatchdog Feed}.each do |serviceName|
God.watch do |w|
w.name = serviceName
w.group = "onlyoffice"
w.grace = 15.seconds
w.start = "systemctl start onlyoffice#{serviceName}"
w.stop = "systemctl stop onlyoffice#{serviceName}"
w.restart = "systemctl restart onlyoffice#{serviceName}"
w.pid_file = "/tmp/onlyoffice#{serviceName}"

w.behavior(:clean_pid_file)

w.start_if do |start|
start.condition(:process_running) do |c|
c.interval = 10.seconds
c.running = false
end
end

w.restart_if do |restart|
restart.condition(:http_response_code) do |c|
c.host = 'localhost'
c.port = dictionary["teamlab#{serviceName}"]
c.path = "/teamlab#{serviceName}/health/check"
c.code_is_not = 200
c.times = 5
c.interval = 5.seconds
end
end
end
end
19 changes: 19 additions & 0 deletions build/install/deb/debian/onlyofficeSsoAuth.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[Unit]
Description=ONLYOFFICE SsoAuth Service
After=network.target syslog.target

[Service]
Type=forking
ExecStartPre=/bin/bash -c 'rm -f /tmp/onlyofficeSsoAuth'
ExecStart=/usr/bin/mono-service -d:/var/www/onlyoffice/Services/TeamLabSvc -l:/tmp/onlyofficeSsoAuth /var/www/onlyoffice/Services/TeamLabSvc/TeamLabSvc.exe --service \"ASC.SsoAuth.Svc.Launcher,ASC.SsoAuth.Svc\" --log SsoAuth
Environment=MONO_IOMAP=all MONO_PATH=/var/www/onlyoffice/Services/TeamLabSvc/
User=onlyoffice
Group=onlyoffice
# Give up if ping don't get an answer
TimeoutSec=600

Restart=no
PrivateTmp=false

[Install]
WantedBy=multi-user.target
23 changes: 23 additions & 0 deletions build/install/deb/debian/onlyofficeThumbnailBuilder.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[Unit]
Description=ONLYOFFICE ThumbnailBuilder Service
After=network.target syslog.target mysqld.service redis-server.service
Wants=mysqld.service redis-server.service

[Service]
Type=forking
ExecStartPre=/bin/bash -c 'rm -f /tmp/onlyofficeThumbnailBuilder'
ExecStart=/usr/bin/mono-service -d:/var/www/onlyoffice/Services/TeamLabSvc -l:/tmp/onlyofficeThumbnailBuilder /var/www/onlyoffice/Services/TeamLabSvc/TeamLabSvc.exe --service "ASC.Files.ThumbnailBuilder.Launcher,ASC.Files.ThumbnailBuilder" --log ThumbnailBuilder
Environment=MONO_IOMAP=all MONO_PATH=/var/www/onlyoffice/Services/TeamLabSvc/
User=onlyoffice
Group=onlyoffice
# Give up if ping don't get an answer
TimeoutSec=600

# Auto-Restart every 24 hours
WatchdogSec=24h

Restart=no
PrivateTmp=false

[Install]
WantedBy=multi-user.target
33 changes: 33 additions & 0 deletions build/install/rpm/Files/god/conf.d/services.god
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
dictionary = { "teamlabNotify" => 9811, "teamlabBackup" => 9812, "teamlabIndex" => 9813, "teamlabStorageMigrate" => 9814, "teamlabTelegram" => 9815, "teamlabStorageEncryption" => 9816, "teamlabThumbnailBuilder" => 9817, "teamlabMailCleaner" => 9819, "teamlabMailWatchdog" => 9818, "teamlabFeed" => 9808 };

%w{Notify Backup Index StorageMigrate Telegram StorageEncryption ThumbnailBuilder MailCleaner MailWatchdog Feed}.each do |serviceName|
God.watch do |w|
w.name = serviceName
w.group = "onlyoffice"
w.grace = 15.seconds
w.start = "systemctl start onlyoffice#{serviceName}"
w.stop = "systemctl stop onlyoffice#{serviceName}"
w.restart = "systemctl restart onlyoffice#{serviceName}"
w.pid_file = "/tmp/onlyoffice#{serviceName}"

w.behavior(:clean_pid_file)

w.start_if do |start|
start.condition(:process_running) do |c|
c.interval = 10.seconds
c.running = false
end
end

w.restart_if do |restart|
restart.condition(:http_response_code) do |c|
c.host = 'localhost'
c.port = dictionary["teamlab#{serviceName}"]
c.path = "/teamlab#{serviceName}/health/check"
c.code_is_not = 200
c.times = 5
c.interval = 5.seconds
end
end
end
end
19 changes: 19 additions & 0 deletions build/install/rpm/Files/systemd/onlyofficeSsoAuth.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[Unit]
Description=ONLYOFFICE SsoAuth Service
After=network.target syslog.target

[Service]
Type=forking
ExecStartPre=/bin/bash -c 'rm -f /tmp/onlyofficeSsoAuth'
ExecStart=/usr/bin/mono-service -d:/var/www/onlyoffice/Services/TeamLabSvc -l:/tmp/onlyofficeSsoAuth /var/www/onlyoffice/Services/TeamLabSvc/TeamLabSvc.exe --service \"ASC.SsoAuth.Svc.Launcher,ASC.SsoAuth.Svc\" --log SsoAuth
Environment=MONO_IOMAP=all MONO_PATH=/var/www/onlyoffice/Services/TeamLabSvc/
User=onlyoffice
Group=onlyoffice
# Give up if ping don't get an answer
TimeoutSec=600

Restart=no
PrivateTmp=false

[Install]
WantedBy=multi-user.target
23 changes: 23 additions & 0 deletions build/install/rpm/Files/systemd/onlyofficeThumbnailBuilder.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[Unit]
Description=ONLYOFFICE ThumbnailBuilder Service
After=network.target syslog.target mysqld.service redis-server.service
Wants=mysqld.service redis-server.service

[Service]
Type=forking
ExecStartPre=/bin/bash -c 'rm -f /tmp/onlyofficeThumbnailBuilder'
ExecStart=/usr/bin/mono-service -d:/var/www/onlyoffice/Services/TeamLabSvc -l:/tmp/onlyofficeThumbnailBuilder /var/www/onlyoffice/Services/TeamLabSvc/TeamLabSvc.exe --service "ASC.Files.ThumbnailBuilder.Launcher,ASC.Files.ThumbnailBuilder" --log ThumbnailBuilder
Environment=MONO_IOMAP=all MONO_PATH=/var/www/onlyoffice/Services/TeamLabSvc/
User=onlyoffice
Group=onlyoffice
# Give up if ping don't get an answer
TimeoutSec=600

# Auto-Restart every 24 hours
WatchdogSec=24h

Restart=no
PrivateTmp=false

[Install]
WantedBy=multi-user.target
Binary file added build/msbuild/Copyright/CommandLine.dll
Binary file not shown.
30 changes: 30 additions & 0 deletions build/msbuild/Copyright/copyright.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<RootDir Condition="$(RootDir)==''">..\..\..\</RootDir>
<MsbuildDir>$(RootDir)build\msbuild\</MsbuildDir>
<CopyrightDir>$(MsbuildDir)Copyright\</CopyrightDir>
<ChangeCopyright Condition="'$(ChangeCopyright)' == ''">0</ChangeCopyright>
</PropertyGroup>

<UsingTask AssemblyFile="$(MsbuildDir)ASC.Web.Core.BuildTask.dll" TaskName="ASC.Web.Core.BuildTask.WriteCopyrightText" />

<Target Name="Build">
<CallTarget Targets="WriteCopyrightText" Condition=" '$(ChangeCopyright)' == '1' "/>
</Target>

<Target Name="WriteCopyrightText">
<!--
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)empty.txt" Ignore="file:$(CopyrightDir)Ignore.txt"/>
-->
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)NKTCopyright.txt" Ignore="file:$(CopyrightDir)Ignore.txt"/>
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)NKT.txt" Include="*AssemblyInfo.cs" Ignore="file:$(CopyrightDir)IgnoreSimple.txt" Replace="file:$(CopyrightDir)AscensioSystem.txt"/>
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)R7.txt" Include="*.license" Ignore="\common\ASC.Billing.Service\" Replace="file:$(CopyrightDir)Onlyoffice.txt"/>
<!--
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)NKT.txt" Include="file:include.txt" Ignore="file:$(CopyrightDir)IgnoreSimple.txt" Replace="file:$(CopyrightDir)AscensioSystem.txt"/>
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)R7Domain.txt" Include="file:include.txt" Ignore="file:$(CopyrightDir)IgnoreSimple.txt" Replace="file:$(CopyrightDir)OnlyofficeDomain.txt"/>
<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" CopyrightFile="$(CopyrightDir)R7.txt" Include="file:include.txt" Ignore="file:$(CopyrightDir)IgnoreSimple.txt" Replace="file:$(CopyrightDir)Onlyoffice.txt"/>
-->
</Target>

</Project>
Binary file added build/msbuild/Copyright/crwriter.exe
Binary file not shown.
22 changes: 22 additions & 0 deletions build/msbuild/Copyright/updateCopyrightYear.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<RootDir Condition="$(RootDir)==''">..\..\..\</RootDir>
<MsbuildDir>$(RootDir)build\msbuild\</MsbuildDir>
<CopyrightDir>$(MsbuildDir)Copyright\</CopyrightDir>
<ChangeCopyright Condition="'$(ChangeCopyright)' == ''">0</ChangeCopyright>
</PropertyGroup>

<UsingTask AssemblyFile="$(MsbuildDir)ASC.Web.Core.BuildTask.dll" TaskName="ASC.Web.Core.BuildTask.WriteCopyrightText" />

<Target Name="Build">
<CallTarget Targets="WriteCopyrightText" Condition=" '$(ChangeCopyright)' == '1' "/>
</Target>

<Target Name="WriteCopyrightText">

<WriteCopyrightText Writer="$(CopyrightDir)crwriter.exe" StartDirectory="$(RootDir)" Ignore="file:$(CopyrightDir)Ignore.txt"/>

</Target>

</Project>
134 changes: 134 additions & 0 deletions build/msbuild/applyMailSubstitutions.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy">

<UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.XmlUpdate" />
<UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.Xml.XmlMassUpdate" />
<UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.CopyDirectory" />
<UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.RemoveDuplicatesAssemblies" />
<UsingTask AssemblyFile="MSBuild.Community.Tasks.dll" TaskName="MSBuild.Community.Tasks.RegexReplace" />

<PropertyGroup>
<Configuration Condition="$(Configuration)==''">Debug</Configuration>
<RootDir Condition="$(RootDir)==''">..\..\</RootDir>
<DeployTo Condition="$(DeployTo)==''">localhost</DeployTo>
<DeployDir Condition="$(DeployDir)==''">$(RootDir)build\deploy\</DeployDir>
<MailFilesDir>$(DeployDir)MailFiles\</MailFilesDir>
<OutDir Condition="$(OutDir)==''">$(DeployDir)$(DeployTo)\</OutDir>
</PropertyGroup>

<ItemGroup>
<MailFiles Include="$(MailFilesDir)/Services/**/*" />
</ItemGroup>

<Target Name="Deploy">
<Message Text="Deploy parameters:"/>
<Message Text=" DeployTo = $(DeployTo)"/>

<RemoveDir Directories="$(OutDir)" ContinueOnError="true" Condition="'$(LeaveOutDir)' != '0'" />

<Copy
SourceFiles="@(MailFiles)"
DestinationFolder="$(OutDir)/Services/%(MailFiles.RecursiveDir)"/>

<CallTarget Targets="ChangeConfigs" Condition=" Exists( '$(MailFilesDir)Substitutions\' ) "/>

</Target>

<Target Name="ChangeConfigs">
<ItemGroup>
<ConfigFiles Include="$(OutDir)Services\MailAggregator\web.autofac.config" >
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Autofac.Config.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailAggregator\web.consumers.config" >
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Consumers.Config.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailAggregator\web.storage.config" >
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Storage.Config.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailAggregator\mail.agg.log4net.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Log4net.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailAggregator\mail.agg.nlog.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.NLog.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailAggregator\ASC.Mail.Aggregator.CollectionService.exe.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailAggregator\ASC.Mail.EmlDownloader.exe.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>

<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\web.autofac.config" >
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Autofac.Config.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\web.consumers.config" >
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Consumers.Config.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\web.storage.config" >
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Storage.Config.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\mail.agg.log4net.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Srv.Log4net.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\mail.agg.nlog.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Srv.NLog.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\ASC.Mail.Aggregator.CollectionService.exe.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Srv.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailAggregatorSrv\ASC.Mail.EmlDownloader.exe.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Agg.Srv.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>

<ConfigFiles Include="$(OutDir)Services\MailWatchdog\web.autofac.config" >
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Autofac.Config.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailWatchdog\ASC.Mail.Watchdog.Service.exe.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Dog.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailWatchdog\mail.dog.log4net.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Dog.Log4net.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailWatchdog\mail.dog.nlog.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Dog.NLog.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>

<ConfigFiles Include="$(OutDir)Services\MailCleaner\web.autofac.config" >
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Autofac.Config.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailCleaner\web.storage.config" >
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Web.Storage.Config.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailCleaner\ASC.Mail.StorageCleaner.exe.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Cln.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailCleaner\mail.cln.log4net.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Cln.Log4net.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>
<ConfigFiles Include="$(OutDir)Services\MailCleaner\mail.cln.nlog.config">
<SubstitutionsFile>$(MailFilesDir)\Substitutions\Mail.Cln.NLog.Substitutions.xml</SubstitutionsFile>
</ConfigFiles>

<ConfigFiles Remove="@(ConfigFiles)" Condition="!Exists('%(ConfigFiles.SubstitutionsFile)')"/>
</ItemGroup>

<RegexReplace Expression="(.+)\." Input="$(DeployTo)">
<Output PropertyName="Substitution" TaskParameter="Output"/>
</RegexReplace>

<XmlMassUpdate
Condition="$(Substitution) != $(DeployTo)"
ContentFile="%(ConfigFiles.FullPath)"
ContentRoot="/"
SubstitutionsFile="%(ConfigFiles.SubstitutionsFile)"
SubstitutionsRoot="/configuration/substitutions/$(Substitution)"
NamespaceDefinitions="un=http://schemas.microsoft.com/practices/2010/unity"/>
<XmlMassUpdate
ContentFile="%(ConfigFiles.FullPath)"
ContentRoot="/"
SubstitutionsFile="%(ConfigFiles.SubstitutionsFile)"
SubstitutionsRoot="/configuration/substitutions/$(DeployTo)"
NamespaceDefinitions="un=http://schemas.microsoft.com/practices/2010/unity"/>
</Target>

</Project>
2 changes: 1 addition & 1 deletion build/msbuild/build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<Target Name="ReplaceResources">
<CallTarget Targets="BuildTask" />
<ReplaceResources BaseFolder="$(ASCDir)" ResourceFile="$(ASCDir)build\sql\custom.resources.json" />
<ReplaceResources BaseFolder="$(ASCDir)" ResourceFile="$(ASCDir)build\sql\r7.resources.json" />
</Target>


Expand Down
Loading

0 comments on commit 4ac38fa

Please sign in to comment.