Skip to content

Hatop python fix #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
domdom82 merged 2 commits into from
Apr 6, 2021
Merged

Hatop python fix #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19a290b
Fix hatop
domdom82 Apr 6, 2021
b881bdd
Update hatop to v0.8
domdom82 Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions config/blobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ 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
object_id: 17a5f66c-bbc1-4e4d-681c-e36420d3e0f5
sha: sha256:a58450560686a429bfd6b3c8732f68f9043fa5ef2be5fac0218f48babfe57cbf
haproxy/lua-5.4.1.tar.gz:
size: 353965
object_id: bbdf988e-4504-49ea-5d88-49adb3488e96
Expand Down
8 changes: 8 additions & 0 deletions jobs/haproxy/templates/pre-start.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions packages/haproxy/packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@ 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
cp haproxy ${BOSH_INSTALL_TARGET}/bin/
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}/
Expand Down