From 7e93832f293182459d4d0a377ed5db054061ec9e Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Thu, 15 Jan 2015 17:37:11 +0100
Subject: [PATCH] Be nicer with the system

---
 unit-files/confd.service           | 1 +
 unit-files/email-forwarder.service | 1 +
 unit-files/haproxy.service         | 1 +
 unit-files/mysql@.service          | 1 +
 unit-files/static@.service         | 2 ++
 unit-files/web@.service            | 1 +
 6 files changed, 7 insertions(+)

diff --git a/unit-files/confd.service b/unit-files/confd.service
index 5bb5e7e..3b09cc4 100644
--- a/unit-files/confd.service
+++ b/unit-files/confd.service
@@ -12,6 +12,7 @@ Before=haproxy.service
 
 [Service]
 Restart=always
+RestartSec=20
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
diff --git a/unit-files/email-forwarder.service b/unit-files/email-forwarder.service
index ad23563..098b6f2 100644
--- a/unit-files/email-forwarder.service
+++ b/unit-files/email-forwarder.service
@@ -9,6 +9,7 @@ After=docker.service
 
 [Service]
 Restart=always
+RestartSec=20
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
diff --git a/unit-files/haproxy.service b/unit-files/haproxy.service
index ab8a02f..6345b4c 100644
--- a/unit-files/haproxy.service
+++ b/unit-files/haproxy.service
@@ -9,6 +9,7 @@ After=docker.service
 
 [Service]
 Restart=always
+RestartSec=20
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
diff --git a/unit-files/mysql@.service b/unit-files/mysql@.service
index 2f19e79..5892aec 100644
--- a/unit-files/mysql@.service
+++ b/unit-files/mysql@.service
@@ -13,6 +13,7 @@ BindsTo=lamp@%i.service
 
 [Service]
 Restart=always
+RestartSec=20
 TimeoutStartSec=0
 Type=notify
 NotifyAccess=all
diff --git a/unit-files/static@.service b/unit-files/static@.service
index 12be287..13905b6 100644
--- a/unit-files/static@.service
+++ b/unit-files/static@.service
@@ -8,6 +8,8 @@ Requires=web@%i.service
 Before=web@%i.service
 
 [Service]
+Type=oneshot
+RemainAfterExit=yes
 ExecStart=/bin/bash -euxc ' \
   application_folder=/data/domains/%i/%p/www-content; \
   if [ ! -d $application_folder ]; then \
diff --git a/unit-files/web@.service b/unit-files/web@.service
index 6e0bc30..7000533 100644
--- a/unit-files/web@.service
+++ b/unit-files/web@.service
@@ -13,6 +13,7 @@ Before=backup@%i.timer
 
 [Service]
 Restart=always
+RestartSec=20
 TimeoutStartSec=0
 Type=notify
 NotifyAccess=all
-- 
GitLab