From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 30 Jan 2023 16:37:16 +0000 (+0000)
Subject: CI: Fix up redis create-cluster script for version on Ubuntu 20.04
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2428c08b7afbf102db7fdf8723ee63e734e33a39;p=thirdparty%2Ffreeradius-server.git

CI: Fix up redis create-cluster script for version on Ubuntu 20.04
---

diff --git a/scripts/ci/redis-setup.sh b/scripts/ci/redis-setup.sh
index 5076730ee64..336649b7dad 100755
--- a/scripts/ci/redis-setup.sh
+++ b/scripts/ci/redis-setup.sh
@@ -31,6 +31,11 @@ fi
 sed -ie "s#\$BIN_PATH/redis-cli#echo 'yes' | redis-cli#" "${TMP_REDIS_DIR}/create-cluster"
 sed -ie "s#\$BIN_PATH/redis-server#redis-server#" "${TMP_REDIS_DIR}/create-cluster"
 
+# Remove option not applicable to redis version on Ubuntu 20.04
+sed -ie "s# --appenddirname appendonlydir-\${PORT}##" "${TMP_REDIS_DIR}/create-cluster"
+# Fix cleanup to match option change above
+sed -ie "s#appendonlydir-\*#appendonly\*.aof#" "${TMP_REDIS_DIR}/create-cluster"
+
 # Again, not needed for CI, but useful for local testing
 if [ -z "$1" ]; then
     create-cluster start