public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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 <philippetrepanier@users.noreply.github.com>
This commit is contained in:
Philippe Trepanier 2022-12-20 07:08:54 -05:00 committed by GitHub
parent 565ff7197e
commit 462dcbf27f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitnami/redis-cluster/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh
View File

@ -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
}

4
bitnami/redis-cluster/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh
View File

@ -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
}

4
bitnami/redis/6.2/debian-11/rootfs/opt/bitnami/scripts/libredis.sh
View File

@ -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
}

4
bitnami/redis/7.0/debian-11/rootfs/opt/bitnami/scripts/libredis.sh
View File

@ -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
}