From 462dcbf27fa90cc683bf65d50a71a2f03a92bbf9 Mon Sep 17 00:00:00 2001 From: Philippe Trepanier Date: Tue, 20 Dec 2022 07:08:54 -0500 Subject: [PATCH] [bitnami/redis] - Include overrides config once only (#15986) Redis - Include overrides config once only Fixes issue where ACL in overrides file would result in an error: Duplicate user found. A user can only be defined once in config files Signed-off-by: Philippe Trepanier --- .../6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh | 4 ++++ .../7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh | 4 ++++ .../6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh | 4 ++++ .../7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh b/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh index bbb02ba71b95..82db3170f047 100644 --- a/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh +++ b/bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh @@ -361,6 +361,10 @@ redis_initialize() { ######################### redis_append_include_conf() { if [[ -f "$REDIS_OVERRIDES_FILE" ]]; then + # Remove all include statements including commented ones + redis_conf_set include "$REDIS_OVERRIDES_FILE" + redis_conf_unset "include" + echo "include $REDIS_OVERRIDES_FILE" >> "${REDIS_BASE_DIR}/etc/redis.conf" fi } diff --git a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh index bbb02ba71b95..82db3170f047 100644 --- a/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh +++ b/bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh @@ -361,6 +361,10 @@ redis_initialize() { ######################### redis_append_include_conf() { if [[ -f "$REDIS_OVERRIDES_FILE" ]]; then + # Remove all include statements including commented ones + redis_conf_set include "$REDIS_OVERRIDES_FILE" + redis_conf_unset "include" + echo "include $REDIS_OVERRIDES_FILE" >> "${REDIS_BASE_DIR}/etc/redis.conf" fi } diff --git a/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh b/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh index bbb02ba71b95..82db3170f047 100644 --- a/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh +++ b/bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh @@ -361,6 +361,10 @@ redis_initialize() { ######################### redis_append_include_conf() { if [[ -f "$REDIS_OVERRIDES_FILE" ]]; then + # Remove all include statements including commented ones + redis_conf_set include "$REDIS_OVERRIDES_FILE" + redis_conf_unset "include" + echo "include $REDIS_OVERRIDES_FILE" >> "${REDIS_BASE_DIR}/etc/redis.conf" fi } diff --git a/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh b/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh index bbb02ba71b95..82db3170f047 100644 --- a/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh +++ b/bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh @@ -361,6 +361,10 @@ redis_initialize() { ######################### redis_append_include_conf() { if [[ -f "$REDIS_OVERRIDES_FILE" ]]; then + # Remove all include statements including commented ones + redis_conf_set include "$REDIS_OVERRIDES_FILE" + redis_conf_unset "include" + echo "include $REDIS_OVERRIDES_FILE" >> "${REDIS_BASE_DIR}/etc/redis.conf" fi }