From f0cc70893362f897cafa21d9525a13b29d819556 Mon Sep 17 00:00:00 2001
From: Felix Bartels <felix@host-consultants.de>
Date: Fri, 21 Jun 2019 07:50:48 +0200
Subject: [PATCH] Add softdelete and backup to scheduler (#189)

* disable soft delete in kopano-server and add cron in scheduler to execute it there (fixes #187)
* fix cron example for backup
---
 core/defaultconfigs/server.py | 1 +
 docker-compose.yml            | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/defaultconfigs/server.py b/core/defaultconfigs/server.py
index b8ba186..a8909b1 100644
--- a/core/defaultconfigs/server.py
+++ b/core/defaultconfigs/server.py
@@ -12,6 +12,7 @@ kcconf.configkopano({
         'server_listen': "*:236",
         'server_listen_tls': "*:237",
         'sync_gab_realtime': "no",
+	'softdelete_lifetime': "0",
         'kcoidc_initialize_timeout': "360"
     }
 })
diff --git a/docker-compose.yml b/docker-compose.yml
index f2477db..9c9e68c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -509,7 +509,8 @@ services:
       - TZ=${TZ}
       - CRON_KOPANOUSERS=10 * * * * docker exec kopano_server kopano-admin --sync
       - CRON_ZPUSHGAB=0 22 * * * docker exec kopano_zpush z-push-gabsync -a sync
-      - CRONDELAYED_KBACKUP=30 1 * * * docker run --rm -it zokradonh/kopano_utils kopano-backup -h
+      - CRONDELAYED_KBACKUP=30 1 * * * docker run --rm -it --volumes-from kopano_server -v /root/kopano-backup:/kopano/path ${docker_repo:-zokradonh}/kopano_utils:${CORE_VERSION:-latest} kopano-backup -h
+      - CRONDELAYED_SOFTDELETE=30 2 * * * docker exec kopano_server kopano-admin --purge-softdelete 30
     env_file:
       - kopano_scheduler.env
     volumes: