From 774edc31e951e9e07dabfdc8d3662565bce3e2a6 Mon Sep 17 00:00:00 2001 From: pierreozoux <pierre@ozoux.net> Date: Mon, 27 Oct 2014 14:54:20 +0000 Subject: [PATCH] Removes timeout --- unit-files/haproxy-confd.service | 1 - unit-files/haproxy.service | 1 - unit-files/nginx-discovery@.service | 1 - unit-files/nginx@.service | 1 - unit-files/postfix.service | 1 - 5 files changed, 5 deletions(-) diff --git a/unit-files/haproxy-confd.service b/unit-files/haproxy-confd.service index 3b83446..f23d2cb 100644 --- a/unit-files/haproxy-confd.service +++ b/unit-files/haproxy-confd.service @@ -12,7 +12,6 @@ Before=haproxy.service [Service] Restart=always -TimeoutStartSec=0 ExecStartPre=-/usr/bin/docker kill %p ExecStartPre=-/usr/bin/docker rm %p ExecStart=/usr/bin/docker run \ diff --git a/unit-files/haproxy.service b/unit-files/haproxy.service index 5a9b6bf..bb35251 100644 --- a/unit-files/haproxy.service +++ b/unit-files/haproxy.service @@ -9,7 +9,6 @@ After=docker.service [Service] Restart=always -TimeoutStartSec=0 ExecStartPre=-/usr/bin/docker kill %p ExecStartPre=-/usr/bin/docker rm %p ExecStart=/usr/bin/docker run \ diff --git a/unit-files/nginx-discovery@.service b/unit-files/nginx-discovery@.service index 8b7a16b..d9cd898 100644 --- a/unit-files/nginx-discovery@.service +++ b/unit-files/nginx-discovery@.service @@ -13,7 +13,6 @@ After=nginx@%i.service BindsTo=nginx@%i.service [Service] -TimeoutStartSec=0 # Start ## Test whether service is accessible and then register useful information ExecStart=/bin/bash -c ' \ diff --git a/unit-files/nginx@.service b/unit-files/nginx@.service index 053f501..d8830ce 100644 --- a/unit-files/nginx@.service +++ b/unit-files/nginx@.service @@ -13,7 +13,6 @@ Before=%p-discovery@%i.service [Service] Restart=always -TimeoutStartSec=0 ExecStartPre=-/usr/bin/docker kill %p-%i ExecStartPre=-/usr/bin/docker rm %p-%i ExecStart=/usr/bin/docker run \ diff --git a/unit-files/postfix.service b/unit-files/postfix.service index 0188ff2..bd2dfaa 100644 --- a/unit-files/postfix.service +++ b/unit-files/postfix.service @@ -9,7 +9,6 @@ After=docker.service [Service] Restart=always -TimeoutStartSec=0 ExecStartPre=-/usr/bin/docker kill %p ExecStartPre=-/usr/bin/docker rm %p ExecStart=/usr/bin/docker run \ -- GitLab