diff --git a/README.md b/README.md index 92bcce4..7178465 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ This is a [Heroku buildpack](http://devcenter.heroku.com/articles/buildpacks) th allows an application to use an [stunnel](http://stunnel.org) to connect securely to Heroku Redis. It is meant to be used in conjunction with other buildpacks. -**This buildpack is only for use with Heroku Redis 4 and 5. For Heroku Redis 6 and newer, use its built-in TLS support instead.** - -**For more information, see [Securing Heroku Redis](https://devcenter.heroku.com/articles/securing-heroku-redis).** +> [!WARNING] +> This buildpack is not compatible with `heroku-24`+ and is not needed for Redis 6+, which supports native TLS. +> For more information, see [Securing Heroku Redis](https://devcenter.heroku.com/articles/heroku-redis#security-and-compliance). ## Usage diff --git a/bin/compile b/bin/compile index f337532..bc20a04 100755 --- a/bin/compile +++ b/bin/compile @@ -13,11 +13,12 @@ unset GIT_DIR BUILD_DIR=$1 BUILDPACK_DIR="$(dirname $(dirname $0))" -STUNNEL=$(command -v stunnel4) - -if [ -z $STUNNEL ]; then - echo "------> stunnel not detected! stunnel not supported on heroku-24+" - echo "------> this buildpack is not required for Redis 6+: https://devcenter.heroku.com/articles/heroku-redis#security-and-compliance" +if ! command -v stunnel4 > /dev/null; then + echo "! stunnel not detected! stunnel not supported on heroku-24+" + echo "! This buildpack is not required for Redis 6+. Remove this buildpack using:" + echo "! $ heroku buildpacks:remove heroku/redis" + echo "! And then follow the instructions for using Redis' native TLS support:" + echo "! https://devcenter.heroku.com/articles/heroku-redis#security-and-compliance" exit 1 fi diff --git a/bin/start-stunnel b/bin/start-stunnel index 3daf664..3310f7f 100755 --- a/bin/start-stunnel +++ b/bin/start-stunnel @@ -1,14 +1,6 @@ #!/usr/bin/env bash main() { - STUNNEL=$(command -v stunnel4) - - if [ -z $STUNNEL ]; then - echo "buildpack=stunnel at=error stunnel not detected! stunnel not supported on heroku-24+" - echo "buildpack=stunnel at=error this buildpack is not required for Redis 6+: https://devcenter.heroku.com/articles/heroku-redis#security-and-compliance" - exit 1 - fi - if ! is-enabled "${STUNNEL_ENABLED:-1}"; then at stunnel-disabled exec "$@"