From: Debian HAProxy Maintainers <pkg-haproxy-maintainers@lists.alioth.debian.org>
Date: Wed, 17 May 2017 10:01:45 +0000 (+0100)
Subject: haproxy.service-use-environment-variables
X-Git-Tag: archive/raspbian/2.0.5-1+rpi1~1^2^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=78d7964664b8c4a7113611be87a0eba33b8319f9;p=haproxy.git

haproxy.service-use-environment-variables

Last-Update: 2014-06-20
Forwarded: not-needed

Gbp-Pq: Name haproxy.service-use-environment-variables.patch
---

diff --git a/contrib/systemd/haproxy.service.in b/contrib/systemd/haproxy.service.in
index b4955e0..6d8a66e 100644
--- a/contrib/systemd/haproxy.service.in
+++ b/contrib/systemd/haproxy.service.in
@@ -7,9 +7,10 @@ Wants=syslog.service
 
 [Service]
 Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid"
-ExecStartPre=@SBINDIR@/haproxy -f $CONFIG -c -q
-ExecStart=@SBINDIR@/haproxy-systemd-wrapper -f $CONFIG -p $PIDFILE
-ExecReload=@SBINDIR@/haproxy -f $CONFIG -c -q
+EnvironmentFile=-/etc/default/haproxy
+ExecStartPre=@SBINDIR@/haproxy -f $CONFIG -c -q $EXTRAOPTS
+ExecStart=@SBINDIR@/haproxy-systemd-wrapper -f $CONFIG -p $PIDFILE $EXTRAOPTS
+ExecReload=@SBINDIR@/haproxy -f $CONFIG -c -q $EXTRAOPTS
 ExecReload=/bin/kill -USR2 $MAINPID
 KillMode=mixed
 Restart=always