From 19a290b54108d98244dff1b1d63acc43ac9484c3 Mon Sep 17 00:00:00 2001
From: Dominik Froehlich <Dominik.Frolic@gmail.com>
Date: Tue, 6 Apr 2021 13:12:44 +0200
Subject: [PATCH 1/2] Fix hatop

---
 config/blobs.yml                     | 5 ++---
 jobs/haproxy/templates/pre-start.erb | 8 ++++++++
 packages/haproxy/packaging           | 2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/config/blobs.yml b/config/blobs.yml
index a7c50ec2..e2f5ba79 100644
--- a/config/blobs.yml
+++ b/config/blobs.yml
@@ -3,9 +3,8 @@ haproxy/haproxy-2.2.5.tar.gz:
   object_id: 14319fe5-f669-4485-6b7f-b0d66593af38
   sha: c2d805b4923e065c503d330ff84633d2a194d399
 haproxy/hatop:
-  size: 72429
-  object_id: d86cd983-5ca3-4293-6620-56a9273be80f
-  sha: daddb3f13a70d4e2fa0802333c2e13468635171f
+  size: 72445
+  sha: sha256:a58450560686a429bfd6b3c8732f68f9043fa5ef2be5fac0218f48babfe57cbf
 haproxy/lua-5.4.1.tar.gz:
   size: 353965
   object_id: bbdf988e-4504-49ea-5d88-49adb3488e96
diff --git a/jobs/haproxy/templates/pre-start.erb b/jobs/haproxy/templates/pre-start.erb
index 9be9a55d..ab2d7aae 100644
--- a/jobs/haproxy/templates/pre-start.erb
+++ b/jobs/haproxy/templates/pre-start.erb
@@ -8,3 +8,11 @@ cat > <%= "/var/vcap/jobs/haproxy/errorfiles/custom#{status_code}.http" %> << EO
 <%= http_content %>
 EOF
 <% end -%>
+
+if [ ! -e /usr/bin/python ] && [ -e /usr/bin/python3 ]; then
+  sudo ln -s /usr/bin/python3 /usr/bin/python
+fi
+
+if [ ! -e /usr/local/bin/hatop ]; then
+  sudo ln -s /var/vcap/packages/haproxy/hatop-wrapper /usr/local/bin/hatop
+fi
diff --git a/packages/haproxy/packaging b/packages/haproxy/packaging
index 69f9138d..01fabcfc 100644
--- a/packages/haproxy/packaging
+++ b/packages/haproxy/packaging
@@ -31,6 +31,7 @@ pushd socat-${SOCAT_VERSION}
   chmod 755 ${BOSH_INSTALL_TARGET}/bin/socat
 popd
 
+echo "Installing HAproxy..."
 tar xf haproxy/haproxy-${HAPROXY_VERSION}.tar.gz
 pushd haproxy-${HAPROXY_VERSION}
   make TARGET=linux-glibc USE_OPENSSL=1 USE_PCRE2=1 USE_PCRE2_JIT=yes USE_STATIC_PCRE2=1 USE_ZLIB=1 PCRE2DIR=${BOSH_INSTALL_TARGET} USE_LUA=1 LUA_LIB=${BOSH_INSTALL_TARGET}/lib LUA_INC=${BOSH_INSTALL_TARGET}/include
@@ -38,6 +39,7 @@ pushd haproxy-${HAPROXY_VERSION}
   chmod 755 ${BOSH_INSTALL_TARGET}/bin/haproxy
 popd
 
+echo "Installing hatop..."
 cp haproxy/hatop ${BOSH_INSTALL_TARGET}/bin/hatop
 chmod 755 ${BOSH_INSTALL_TARGET}/bin/hatop
 cp hatop-wrapper ${BOSH_INSTALL_TARGET}/

From b881bddb2d0569571056c295cfac312c06385ca3 Mon Sep 17 00:00:00 2001
From: Dominik Froehlich <Dominik.Frolic@gmail.com>
Date: Tue, 6 Apr 2021 16:00:57 +0200
Subject: [PATCH 2/2] Update hatop to v0.8

---
 config/blobs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/blobs.yml b/config/blobs.yml
index e2f5ba79..8091d2d5 100644
--- a/config/blobs.yml
+++ b/config/blobs.yml
@@ -4,6 +4,7 @@ haproxy/haproxy-2.2.5.tar.gz:
   sha: c2d805b4923e065c503d330ff84633d2a194d399
 haproxy/hatop:
   size: 72445
+  object_id: 17a5f66c-bbc1-4e4d-681c-e36420d3e0f5
   sha: sha256:a58450560686a429bfd6b3c8732f68f9043fa5ef2be5fac0218f48babfe57cbf
 haproxy/lua-5.4.1.tar.gz:
   size: 353965