Merge branch 'fix-rclone-webdav'

NethServer · Oct 29, 2024 · 4a859e3 · 4a859e3
2 parents c4b84fa + 8fe3c87
commit 4a859e3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/core/imageroot/etc/systemd/system/rclone-webdav.service b/core/imageroot/etc/systemd/system/rclone-webdav.service
@@ -8,7 +8,7 @@ Environment=BACKUP_VOLUME=rclone-webdav
 EnvironmentFile=/etc/nethserver/core.env
 EnvironmentFile=-/var/lib/nethserver/node/state/rclone-webdav.env
 Restart=always
-TimeoutStopSec=70
+TimeoutStopSec=120
 ExecStartPre=/bin/rm -f %t/%N.pid %t/%N.cid
 ExecStart=/usr/bin/podman run \
     --conmon-pidfile=%t/%N.pid \
@@ -23,10 +23,11 @@ ExecStart=/usr/bin/podman run \
     --entrypoint=[] \
     ${RESTIC_IMAGE} rclone serve webdav /srv/repo --addr :4694 $OPTIONS
 
-ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%N.cid -t 10
+ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%N.cid -t 90
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%N.cid
 PIDFile=%t/%N.pid
 Type=forking
+SuccessExitStatus=143
 
 [Install]
 WantedBy=default.target
diff --git a/core/imageroot/var/lib/nethserver/node/update-core.d/20restart_webdav b/core/imageroot/var/lib/nethserver/node/update-core.d/20restart_webdav
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#
+# Copyright (C) 2024 Nethesis S.r.l.
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+
+exec 1>&2
+set -e
+
+# Restart the local backup destination WebDAV server:
+systemctl restart rclone-webdav.service