heroku · May 17, 2023 · May 17, 2023 · May 17, 2023 · May 17, 2023 · May 17, 2023
Showing with 17 additions and 43 deletions.

+1 −1 README.md

+16 −42 bin/stunnel-conf.sh
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ available when using the hobby tier.
 Then set this buildpack as your initial buildpack with:
 
 ```console
-$ heroku buildpacks:add -i 1 heroku/redis
+$ heroku buildpacks:add -i 1 https://github.com/dockwa/heroku-buildpack-redis-stunnel.git
 ```
 
 Then confirm you are using this buildpack as well as your language buildpack like so:

diff --git a/bin/stunnel-conf.sh b/bin/stunnel-conf.sh
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-URLS=${REDIS_STUNNEL_URLS:-REDIS_URL `compgen -v HEROKU_REDIS`}
-n=1
 
 mkdir -p /app/vendor/stunnel/var/run/stunnel/
 
@@ -16,48 +14,24 @@ ciphers = HIGH:!ADH:!AECDH:!LOW:!EXP:!MD5:!3DES:!SRP:!PSK:@STRENGTH
 debug = ${STUNNEL_LOGLEVEL:-notice}
 EOFEOF
 
-for URL in $URLS
-do
-  eval URL_VALUE=\$$URL
-  PARTS=$(echo $URL_VALUE | perl -lne 'print "$1 $2 $3 $4 $5 $6 $7" if /^([^:]+):\/\/([^:]+):([^@]+)@(.*?):(.*?)(\/(.*?)(\\?.*))?$/')
-  if [ -z "$PARTS" ]
-  then
-    PARTS=$(echo $URL_VALUE | perl -lne 'print "$1 $2 $3 $4 $5 $6 $7" if /^([^:]+):\/\/:([^@]+)@(.*?):(.*?)(\/(.*?)(\\?.*))?$/')
-    WITHOUT_USERNAME=true
-  fi
-  URI=( $PARTS )
-
-
-  if [ "$WITHOUT_USERNAME" = true ] ; then
-    URI_SCHEME=${URI[0]}
-    URI_PASS=${URI[1]}
-    URI_HOST=${URI[2]}
-    URI_PORT=${URI[3]}
-    STUNNEL_PORT=$((URI_PORT + 1))
-
-    echo "Setting ${URL}_STUNNEL config var"
-    export ${URL}_STUNNEL=$URI_SCHEME://:$URI_PASS@127.0.0.1:637${n}
-  else
-    URI_SCHEME=${URI[0]}
-    URI_USER=${URI[1]}
-    URI_PASS=${URI[2]}
-    URI_HOST=${URI[3]}
-    URI_PORT=${URI[4]}
-    STUNNEL_PORT=$((URI_PORT + 1))
-
-    echo "Setting ${URL}_STUNNEL config var"
-    export ${URL}_STUNNEL=$URI_SCHEME://$URI_USER:$URI_PASS@127.0.0.1:637${n}
-  fi
-
-  cat >> /app/vendor/stunnel/stunnel.conf << EOFEOF
-[$URL]
+REDIS_URL=${HEROKU_REDIS_BLUE_URL/rediss/redis}
+REDIS_URL=${REDIS_URL%@*}
+REDIS_URL=${REDIS_URL}@127.0.0.1:6371
+
+#export REDIS_URL=$REDIS_URL
+
+STUNNEL_URI=${HEROKU_REDIS_BLUE_URL#*@}
+#STUNNEL_URI=rediss://${STUNNEL_URI}
+export STUNNEL_URI=${STUNNEL_URI}
+
+cat >> /app/vendor/stunnel/stunnel.conf << EOFEOF
+[REDIS_URL]
 client = yes
-accept = 127.0.0.1:637${n}
-connect = $URI_HOST:$STUNNEL_PORT
+accept = 127.0.0.1:6371
+connect = ${STUNNEL_URI}
 retry = ${STUNNEL_CONNECTION_RETRY:-"no"}
 EOFEOF
 
-  let "n += 1"
-done
-
+cat /app/vendor/stunnel/stunnel.conf
+env
 chmod go-rwx /app/vendor/stunnel/*