From 341df23f70b5de01e89007a397113abeb750e470 Mon Sep 17 00:00:00 2001
From: Lukasz Nowak <luke@nexedi.com>
Date: Thu, 28 Mar 2019 13:55:50 +0100
Subject: [PATCH] caddy-frontend: Cleanup PIDFILE after reload
---
software/caddy-frontend/buildout.hash.cfg | 2 +-
software/caddy-frontend/templates/apache-lazy-script-call.sh.in | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg
index 4b50d61b6..8d79845c2 100644
--- a/software/caddy-frontend/buildout.hash.cfg
+++ b/software/caddy-frontend/buildout.hash.cfg
@@ -102,7 +102,7 @@ md5sum = ac17212a53be2c08ab84682ec665148d
[template-caddy-lazy-script-call]
filename = templates/apache-lazy-script-call.sh.in
-md5sum = ebe5d3d19923eb812a40019cb11276d8
+md5sum = b9f73f6323f9fceea054c46c854d2862
[template-graceful-script]
filename = templates/graceful-script.sh.in
diff --git a/software/caddy-frontend/templates/apache-lazy-script-call.sh.in b/software/caddy-frontend/templates/apache-lazy-script-call.sh.in
index d47997cad..7c94317b6 100644
--- a/software/caddy-frontend/templates/apache-lazy-script-call.sh.in
+++ b/software/caddy-frontend/templates/apache-lazy-script-call.sh.in
@@ -9,6 +9,7 @@ if [ ! -f $PIDFILE ]; then
echo $PID > $PIDFILE
sleep {{ wait_time }}
{{ lazy_command }}
+ rm -f $PIDFILE
else
ps --pid `cat $PIDFILE` &>/dev/null
if [ $? -eq 0 ]; then
@@ -17,6 +18,7 @@ else
echo $PID > $PIDFILE
sleep {{ wait_time }}
{{ lazy_command }}
+ rm -f $PIDFILE
fi
fi
--
2.30.9