Skip to content
GitLab
Explore
Sign in
libre.sh
docker
nextcloud
Compare revisions
93dcc3960cfa2c4a9920ea554decbcfecdd64c1d to 4bd3f37b21c8aeabed263bfc12c7d9baf577ed88
Commits on Source (2)
ci: exit on failed patch
· eb2e5f9e
Hugo Renard
authored
Apr 10, 2024
eb2e5f9e
fix: disable oo cron via cronChecker config
· 4bd3f37b
Hugo Renard
authored
Apr 10, 2024
4bd3f37b
Hide whitespace changes
Inline
Side-by-side
base/Dockerfile
View file @
4bd3f37b
...
...
@@ -36,7 +36,7 @@ RUN for app in $(cat /usr/src/nextcloud/apps/nextcloud.json | jq -r .remove[]);d
rm
/usr/src/nextcloud/config/autoconfig.php /usr/src/nextcloud/config/config.sample.php
;
RUN for
patch
in
/usr/src/nextcloud/patches/
*
.diff
;
\
do
\
patch
-p0
<
$patch
;
\
patch
-p0
<
$patch
||
exit
1
;
\
done
;
\
rm
-r
/usr/src/nextcloud/patches/
;
...
...
base/patches/fix-oo.diff
deleted
100644 → 0
View file @
93dcc396
# Waiting a new relaease of OO:https://github.com/ONLYOFFICE/onlyoffice-nextcloud/issues/864
--- apps/onlyoffice/appinfo/info.xml
+++ apps/onlyoffice/appinfo/info.xml
@@ -39,7 +39,4 @@
<commands>
<command>OCA\Onlyoffice\Command\DocumentServer</command>
</commands>
- <background-jobs>
- <job>OCA\Onlyoffice\Cron\EditorsCheck</job>
- </background-jobs>
</info>
# Waiting a new relaease of OO:https://github.com/ONLYOFFICE/onlyoffice-nextcloud/issues/864
--- apps/onlyoffice/lib/Controller/JobListController.php
+++ apps/onlyoffice/lib/Controller/JobListController.php
@@ -96,11 +96,7 @@
class JobListController extends Controller {
*
*/
private function checkEditorsCheckJob() {
- if ($this->config->GetEditorsCheckInterval() > 0) {
- $this->addJob(EditorsCheck::class);
- } else {
- $this->removeJob(EditorsCheck::class);
- }
+ $this->removeJob(EditorsCheck::class);
}
/**
base/refresh_config.sh
View file @
4bd3f37b
...
...
@@ -24,3 +24,4 @@ else
fi
php occ config:app:set mail app.mail.smtp.timeout
--value
=
10
php occ config:app:set onlyoffice cronChecker
--value
=
false