From 1dc67550ff981d35f93e7bd0efb797a13f1f6e46 Mon Sep 17 00:00:00 2001
From: Lukasz Nowak <luke@nexedi.com>
Date: Wed, 26 Jun 2019 13:06:47 +0200
Subject: [PATCH] fix "caddy-frontend: Improve validation with decoupled
 configuration state calculation"

The last state value has been reverted by mistake, put back correct one.
---
 software/caddy-frontend/buildout.hash.cfg                   | 2 +-
 .../templates/configuration-state-script.sh.in              | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg
index d9b9b1479..32a348c63 100644
--- a/software/caddy-frontend/buildout.hash.cfg
+++ b/software/caddy-frontend/buildout.hash.cfg
@@ -102,7 +102,7 @@ md5sum = 89839a3f4ab71cab459afd1c27d00326
 
 [template-configuration-state-script]
 filename = templates/configuration-state-script.sh.in
-md5sum = 00dfdc488548d1b14e89ba5f2f08fcb8
+md5sum = 8d55aea0a4ebc262d2f7c2f96dd5428c
 
 [template-rotate-script]
 filename = templates/rotate-script.sh.in
diff --git a/software/caddy-frontend/templates/configuration-state-script.sh.in b/software/caddy-frontend/templates/configuration-state-script.sh.in
index b08f767a9..0295c94d5 100644
--- a/software/caddy-frontend/templates/configuration-state-script.sh.in
+++ b/software/caddy-frontend/templates/configuration-state-script.sh.in
@@ -8,9 +8,11 @@ touch $SIGNATURE_FILE
 {{ sha256sum }} {{ path_list }} 2> /dev/null | sort -k 66 > $NSIGNATURE_FILE
 
 if diff "$SIGNATURE_FILE" "$NSIGNATURE_FILE" > /dev/null ; then
+  # No changes since last run just propagate information
   rm -f ${NSIGNATURE_FILE}
-  exit 1
+  exit 0
 else
+  # Changes since last run, so store new value and propagate information
   mv "$NSIGNATURE_FILE" "$SIGNATURE_FILE"
-  exit 0
+  exit 1
 fi
-- 
2.30.9