From 90a113108783357cbd85cc0fa2f6a36917f22509 Mon Sep 17 00:00:00 2001 From: Apollon Oikonomopoulos Date: Sun, 25 Mar 2018 11:31:50 +0200 Subject: [PATCH] Use the variables from /etc/default/haproxy This will allow seamless upgrades from the sysvinit system while respecting any changes the users may have made. It will also make local configuration easier than overriding the systemd unit file. Last-Update: 2014-06-20 Forwarded: not-needed Gbp-Pq: Name haproxy.service-use-environment-variables.patch --- contrib/systemd/haproxy.service.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/systemd/haproxy.service.in b/contrib/systemd/haproxy.service.in index ac88c37..0dd36d1 100644 --- a/contrib/systemd/haproxy.service.in +++ b/contrib/systemd/haproxy.service.in @@ -5,10 +5,11 @@ Documentation=file:/usr/share/doc/haproxy/configuration.txt.gz After=network.target rsyslog.service [Service] +EnvironmentFile=-/etc/default/haproxy Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" -ExecStartPre=@SBINDIR@/haproxy -f $CONFIG -c -q -ExecStart=@SBINDIR@/haproxy -Ws -f $CONFIG -p $PIDFILE -ExecReload=@SBINDIR@/haproxy -f $CONFIG -c -q +ExecStartPre=@SBINDIR@/haproxy -f $CONFIG -c -q $EXTRAOPTS +ExecStart=@SBINDIR@/haproxy -Ws -f $CONFIG -p $PIDFILE $EXTRAOPTS +ExecReload=@SBINDIR@/haproxy -f $CONFIG -c -q $EXTRAOPTS ExecReload=/bin/kill -USR2 $MAINPID KillMode=mixed Restart=always -- 2.30.2