Skip to content

Commit 3926652

Browse files
JenkinsRoboJenkinsRobo
committed
Update to v12.1.0
1 parent adc7314 commit 3926652

File tree

102 files changed

+1313
-419
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1313
-419
lines changed

‎build/config/TeamLabSvc.exe.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@
180180
<sender name="email.sender" type="ASC.Core.Notify.Senders.SmtpSender, ASC.Core.Common" host="" port="" userName="" password="" enableSsl="" />
181181
<sender name="messanger.sender" type="ASC.Core.Notify.Senders.JabberSender, ASC.Core.Common" />
182182
<sender name="telegram.sender" type="ASC.Core.Notify.Senders.TelegramSender, ASC.Core.Common" />
183+
<sender name="push.sender" type="ASC.Core.Notify.Senders.PushSender, ASC.Core.Common" />
183184
</senders>
184185
<schedulers>
185186
<scheduler name="WhatsNew" register="ASC.Web.Studio.Core.Notify.NotifyConfiguration.RegisterSendMethods, ASC.Web.Studio" />

‎build/install/deb/Files/god/conf.d/mail.god

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎build/install/deb/Files/god/conf.d/services.god

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
dictionary = { "teamlabNotify" => 9811, "teamlabBackup" => 9812, "teamlabIndex" => 9813, "teamlabStorageMigrate" => 9814, "teamlabTelegram" => 9815, "teamlabStorageEncryption" => 9816, "teamlabThumbnailBuilder" => 9817, "teamlabMailCleaner" => 9819, "teamlabMailWatchdog" => 9818, "teamlabFeed" => 9808 };
1+
dictionary = { "teamlabNotify" => 9811, "teamlabBackup" => 9812, "teamlabIndex" => 9813, "teamlabStorageMigrate" => 9814, "teamlabTelegram" => 9815, "teamlabStorageEncryption" => 9816, "teamlabThumbnailBuilder" => 9817, "teamlabFeed" => 9808 };
22

3-
%w{Notify Backup Index StorageMigrate Telegram StorageEncryption ThumbnailBuilder MailCleaner MailWatchdog Feed}.each do |serviceName|
3+
%w{Notify Backup Index StorageMigrate Telegram StorageEncryption ThumbnailBuilder Feed}.each do |serviceName|
44
God.watch do |w|
55
w.name = "onlyoffice#{serviceName}"
66
w.group = "onlyoffice"

‎build/install/deb/debian/monoserve.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=FastCGI Mono server
3-
After=network.target syslog.target nginx.service mysqld.service redis-server.service
4-
Wants=nginx.service mysqld.service redis-server.service
3+
After=network.target syslog.target nginx.service mysql.service redis-server.service
4+
Wants=nginx.service mysql.service redis-server.service
55

66
[Service]
77
PermissionsStartOnly=true

‎build/install/deb/debian/monoserveApiSystem.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=FastCGI Mono server
3-
After=network.target syslog.target nginx.service mysqld.service redis-server.service
4-
Wants=nginx.service mysqld.service redis-server.service
3+
After=network.target syslog.target nginx.service mysql.service redis-server.service
4+
Wants=nginx.service mysql.service redis-server.service
55

66
[Service]
77
PermissionsStartOnly=true

‎build/install/deb/debian/onlyofficeAutoCleanUp.service

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=ONLYOFFICE AutoCleanUp Service
3-
After=network.target syslog.target mysqld.service
4-
Wants=mysqld.service
3+
After=network.target syslog.target mysql.service
4+
Wants=mysql.service
55

66
[Service]
77
Type=forking
@@ -13,7 +13,7 @@ Group=onlyoffice
1313
# Give up if ping don't get an answer
1414
TimeoutSec=600
1515

16-
Restart=no
16+
Restart=always
1717
PrivateTmp=false
1818

1919
[Install]

‎build/install/deb/debian/onlyofficeBackup.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=Start ONLYOFFICE Backup Service
3-
After=network.target syslog.target mysqld.service redis-server.service
4-
Wants=mysqld.service redis-server.service
3+
After=network.target syslog.target mysql.service redis-server.service
4+
Wants=mysql.service redis-server.service
55

66
[Service]
77
Type=forking

‎build/install/deb/debian/onlyofficeFeed.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=ONLYOFFICE Feed Service
3-
After=network.target syslog.target mysqld.service redis-server.service
4-
Wants=mysqld.service redis-server.service
3+
After=network.target syslog.target mysql.service redis-server.service
4+
Wants=mysql.service redis-server.service
55

66
[Service]
77
Type=forking

‎build/install/deb/debian/onlyofficeIndex.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=Start ONLYOFFICE Index Service
3-
After=network.target syslog.target elasticsearch.service mysqld.service redis-server.service
4-
Wants=elasticsearch.service mysqld.service redis-server.service
3+
After=network.target syslog.target elasticsearch.service mysql.service redis-server.service
4+
Wants=elasticsearch.service mysql.service redis-server.service
55

66
[Service]
77
Type=forking

‎build/install/deb/debian/onlyofficeMailAggregator.service

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[Unit]
22
Description=ONLYOFFICE MailAggregator Service
3-
After=network.target syslog.target mysqld.service
4-
Wants=mysqld.service
3+
After=network.target syslog.target mysql.service
4+
Wants=mysql.service
55

66
[Service]
77
Type=notify
88
User=onlyoffice
99
Group=onlyoffice
1010
WorkingDirectory=/var/www/onlyoffice/Services/MailAggregator
11-
ExecStart=/usr/share/dotnet/dotnet /var/www/onlyoffice/Services/MailAggregator/ASC.Mail.Aggregator.Service.dll --urls=http://0.0.0.0:5025 --pathToConf=/etc/onlyoffice/communityserver --pathToNlogConf=/etc/onlyoffice/communityserver --log:dir=/var/log/onlyoffice/mail --log:name=mail-aggregator --ENVIRONMENT=production
11+
ExecStart=/usr/bin/dotnet /var/www/onlyoffice/Services/MailAggregator/ASC.Mail.Aggregator.Service.dll --urls=http://0.0.0.0:5025 --pathToConf=/etc/onlyoffice/communityserver --pathToNlogConf=/etc/onlyoffice/communityserver --log:dir=/var/log/onlyoffice/mail --log:name=mail-aggregator --ENVIRONMENT=production
1212
Environment=OPENSSL_CONF=/etc/onlyoffice/communityserver/openssl.cnf
1313
TimeoutSec=600
1414

15-
Restart=no
15+
Restart=always
1616
PrivateTmp=false
1717

1818
[Install]

‎build/install/deb/debian/onlyofficeMailCleaner.service

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[Unit]
22
Description=ONLYOFFICE MailCleaner Service
3-
After=network.target syslog.target mysqld.service
4-
Wants=mysqld.service
3+
After=network.target syslog.target mysql.service
4+
Wants=mysql.service
55

66
[Service]
77
Type=notify
88
User=onlyoffice
99
Group=onlyoffice
1010
WorkingDirectory=/var/www/onlyoffice/Services/MailCleaner/
11-
ExecStart=/usr/share/dotnet/dotnet /var/www/onlyoffice/Services/MailCleaner/ASC.Mail.StorageCleaner.Service.dll --urls=http://0.0.0.0:5032 --pathToConf=/etc/onlyoffice/communityserver --pathToNlogConf=/etc/onlyoffice/communityserver --log:dir=/var/log/onlyoffice/mail --log:name=mail-storagecleaner --ENVIRONMENT=production
11+
ExecStart=/usr/bin/dotnet /var/www/onlyoffice/Services/MailCleaner/ASC.Mail.StorageCleaner.Service.dll --urls=http://0.0.0.0:5032 --pathToConf=/etc/onlyoffice/communityserver --pathToNlogConf=/etc/onlyoffice/communityserver --log:dir=/var/log/onlyoffice/mail --log:name=mail-storagecleaner --ENVIRONMENT=production
1212
TimeoutSec=600
1313

14-
Restart=no
14+
Restart=always
1515
PrivateTmp=false
1616

1717
[Install]

‎build/install/deb/debian/onlyofficeMailImap.service

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[Unit]
22
Description=ONLYOFFICE MailImap Service
3-
After=network.target syslog.target mysqld.service redis-server.service
4-
Wants=mysqld.service redis-server.service
3+
After=network.target syslog.target mysql.service redis-server.service
4+
Wants=mysql.service redis-server.service
55

66
[Service]
77
Type=notify
88
User=onlyoffice
99
Group=onlyoffice
1010
WorkingDirectory=/var/www/onlyoffice/Services/MailImap/
11-
ExecStart=/usr/share/dotnet/dotnet /var/www/onlyoffice/Services/MailImap/ASC.Mail.ImapSync.dll --urls=http://0.0.0.0:5026 --pathToConf=/etc/onlyoffice/communityserver --pathToNlogConf=/etc/onlyoffice/communityserver --log:dir=/var/log/onlyoffice/mail --log:name=mail-imapsync --ENVIRONMENT=production
11+
ExecStart=/usr/bin/dotnet /var/www/onlyoffice/Services/MailImap/ASC.Mail.ImapSync.dll --urls=http://0.0.0.0:5026 --pathToConf=/etc/onlyoffice/communityserver --pathToNlogConf=/etc/onlyoffice/communityserver --log:dir=/var/log/onlyoffice/mail --log:name=mail-imapsync --ENVIRONMENT=production
1212
Environment=OPENSSL_CONF=/etc/onlyoffice/communityserver/openssl.cnf
1313
TimeoutSec=600
1414

15-
Restart=no
15+
Restart=always
1616
PrivateTmp=false
1717

1818
[Install]

‎build/install/deb/debian/onlyofficeMailWatchdog.service

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[Unit]
22
Description=ONLYOFFICE MailWatchdog Service
3-
After=network.target syslog.target mysqld.service
4-
Wants=mysqld.service
3+
After=network.target syslog.target mysql.service
4+
Wants=mysql.service
55

66
[Service]
77
Type=notify
88
User=onlyoffice
99
Group=onlyoffice
1010
WorkingDirectory=/var/www/onlyoffice/Services/MailWatchdog/
11-
ExecStart=/usr/share/dotnet/dotnet /var/www/onlyoffice/Services/MailWatchdog/ASC.Mail.Watchdog.Service.dll --urls=http://0.0.0.0:5031 --pathToConf=/etc/onlyoffice/communityserver --pathToNlogConf=/etc/onlyoffice/communityserver --log:dir=/var/log/onlyoffice/mail --log:name=mail-watchdog --ENVIRONMENT=production
11+
ExecStart=/usr/bin/dotnet /var/www/onlyoffice/Services/MailWatchdog/ASC.Mail.Watchdog.Service.dll --urls=http://0.0.0.0:5031 --pathToConf=/etc/onlyoffice/communityserver --pathToNlogConf=/etc/onlyoffice/communityserver --log:dir=/var/log/onlyoffice/mail --log:name=mail-watchdog --ENVIRONMENT=production
1212
TimeoutSec=600
1313

14-
Restart=no
14+
Restart=always
1515
PrivateTmp=false
1616

1717
[Install]

‎build/install/deb/debian/onlyofficeNotify.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=ONLYOFFICE Notify Service
3-
After=network.target syslog.target mysqld.service redis-server.service
4-
Wants=mysqld.service redis-server.service
3+
After=network.target syslog.target mysql.service redis-server.service
4+
Wants=mysql.service redis-server.service
55

66
[Service]
77
Type=forking

‎build/install/deb/debian/onlyofficeRadicale.service

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=ONLYOFFICE Radicale Service
3-
After=network.target syslog.target mysqld.service redis-server.service
4-
Wants=mysqld.service redis-server.service
3+
After=network.target syslog.target mysql.service redis-server.service
4+
Wants=mysql.service redis-server.service
55

66
[Service]
77
Type=forking
@@ -13,7 +13,7 @@ Group=onlyoffice
1313
# Give up if ping don't get an answer
1414
TimeoutSec=600
1515

16-
Restart=no
16+
Restart=always
1717
PrivateTmp=false
1818

1919
[Install]

‎build/install/deb/debian/onlyofficeSocketIO.service

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=ONLYOFFICE SocketIO Service
3-
After=network.target syslog.target mysqld.service redis-server.service
4-
Wants=mysqld.service redis-server.service
3+
After=network.target syslog.target mysql.service redis-server.service
4+
Wants=mysql.service redis-server.service
55

66
[Service]
77
Type=forking
@@ -13,7 +13,7 @@ Group=onlyoffice
1313
# Give up if ping don't get an answer
1414
TimeoutSec=600
1515

16-
Restart=no
16+
Restart=always
1717
PrivateTmp=false
1818

1919
[Install]

‎build/install/deb/debian/onlyofficeSsoAuth.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Group=onlyoffice
1212
# Give up if ping don't get an answer
1313
TimeoutSec=600
1414

15-
Restart=no
15+
Restart=always
1616
PrivateTmp=false
1717

1818
[Install]

‎build/install/deb/debian/onlyofficeStorageEncryption.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=Start ONLYOFFICE StorageEncryption Service
3-
After=network.target syslog.target mysqld.service redis-server.service
4-
Wants=mysqld.service redis-server.service
3+
After=network.target syslog.target mysql.service redis-server.service
4+
Wants=mysql.service redis-server.service
55

66
[Service]
77
Type=forking

‎build/install/deb/debian/onlyofficeStorageMigrate.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=Start ONLYOFFICE StorageMigrate Service
3-
After=network.target syslog.target mysqld.service redis-server.service
4-
Wants=mysqld.service redis-server.service
3+
After=network.target syslog.target mysql.service redis-server.service
4+
Wants=mysql.service redis-server.service
55

66
[Service]
77
Type=forking

‎build/install/deb/debian/onlyofficeTelegram.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=ONLYOFFICE Telegram Service
3-
After=network.target syslog.target mysqld.service
4-
Wants=mysqld.service
3+
After=network.target syslog.target mysql.service
4+
Wants=mysql.service
55

66
[Service]
77
Type=forking

‎build/install/deb/debian/onlyofficeThumb.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Group=onlyoffice
1212
# Give up if ping don't get an answer
1313
TimeoutSec=600
1414

15-
Restart=no
15+
Restart=always
1616
PrivateTmp=false
1717

1818
[Install]

‎build/install/deb/debian/onlyofficeThumbnailBuilder.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=ONLYOFFICE ThumbnailBuilder Service
3-
After=network.target syslog.target mysqld.service redis-server.service
4-
Wants=mysqld.service redis-server.service
3+
After=network.target syslog.target mysql.service redis-server.service
4+
Wants=mysql.service redis-server.service
55

66
[Service]
77
Type=forking

‎build/install/deb/debian/onlyofficeUrlShortener.service

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=ONLYOFFICE UrlShortener Service
3-
After=network.target syslog.target mysqld.service
4-
Wants=mysqld.service
3+
After=network.target syslog.target mysql.service
4+
Wants=mysql.service
55

66
[Service]
77
Type=forking
@@ -13,7 +13,7 @@ Group=onlyoffice
1313
# Give up if ping don't get an answer
1414
TimeoutSec=600
1515

16-
Restart=no
16+
Restart=always
1717
PrivateTmp=false
1818

1919
[Install]

‎build/install/deb/debian/onlyofficeWebDav.service

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=ONLYOFFICE WebDav Service
3-
After=network.target syslog.target mysqld.service
4-
Wants=mysqld.service
3+
After=network.target syslog.target mysql.service
4+
Wants=mysql.service
55

66
[Service]
77
Type=forking
@@ -13,7 +13,7 @@ Group=onlyoffice
1313
# Give up if ping don't get an answer
1414
TimeoutSec=600
1515

16-
Restart=no
16+
Restart=always
1717
PrivateTmp=false
1818

1919
[Install]

‎build/install/deb/debian/postinst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ END
266266

267267
python3 -m pip install --upgrade pip
268268
python3 -m pip install --upgrade requests
269+
python3 -m pip install --upgrade setuptools
269270
python3 -m pip install --upgrade radicale==3.0.5
270271
python3 -m pip install --upgrade $DIR/Tools/radicale/plugins/app_auth_plugin/.
271272
python3 -m pip install --upgrade $DIR/Tools/radicale/plugins/app_store_plugin/.

0 commit comments

Comments
 (0)