From 291c72af54d0ed6e6503487e75b1380f57a8fb69 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Fri, 16 Oct 2015 13:09:22 +0100
Subject: [PATCH] Hopefully less failing backup

---
 unit-files/b-u@.service      | 4 +++-
 unit-files/backup-u@.service | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/unit-files/b-u@.service b/unit-files/b-u@.service
index 463a385..8dbe35a 100644
--- a/unit-files/b-u@.service
+++ b/unit-files/b-u@.service
@@ -3,10 +3,12 @@ Description=Back up data from %i
 
 [Service]
 Type=oneshot
-TimeoutStartSec=0
+TimeoutStartSec=120
 WorkingDirectory=/data/domains/%i/
 EnvironmentFile=/etc/environment
+ExecStartPre=-/bin/docker kill clean-%i
 ExecStartPre=-/bin/docker rm clean-%i
+ExecStartPre=-/bin/docker kill backup-%i
 ExecStartPre=-/bin/docker rm backup-%i
 ExecStartPre=/bin/bash -euxc ' \
   /bin/docker run \
diff --git a/unit-files/backup-u@.service b/unit-files/backup-u@.service
index e662133..c94ea14 100644
--- a/unit-files/backup-u@.service
+++ b/unit-files/backup-u@.service
@@ -3,10 +3,12 @@ Description=Back up data from %i
 
 [Service]
 Type=oneshot
-TimeoutStartSec=0
+TimeoutStartSec=120
 WorkingDirectory=/data/domains/%i/
 EnvironmentFile=/etc/environment
+ExecStartPre=-/bin/docker kill clean-%i
 ExecStartPre=-/bin/docker rm clean-%i
+ExecStartPre=-/bin/docker kill backup-%i
 ExecStartPre=-/bin/docker rm backup-%i
 ExecStartPre=/bin/bash -euxc ' \
   /bin/docker run \
-- 
GitLab