Skip to content

[bitnami/redis-sentinel] Allow setting tls-ca-cert-dir via ENV variable #79386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
migruiz4 merged 2 commits into from
Apr 11, 2025
Merged

[bitnami/redis-sentinel] Allow setting tls-ca-cert-dir via ENV variable #79386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7f9160
[bitnami/redis-sentinel] Allow setting tls-ca-cert-dir via ENV variable
mueller-ma Apr 2, 2025
7acdd45
Apply suggestion
mueller-ma Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions bitnami/redis-sentinel/7.4/debian-12/rootfs/opt/bitnami/scripts/libredissentinel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,11 @@ redis_validate() {
print_validation_error "The private key file in the specified path ${REDIS_SENTINEL_TLS_KEY_FILE} does not exist"
fi
if [[ -z "$REDIS_SENTINEL_TLS_CA_FILE" ]]; then
print_validation_error "You must provide a CA X.509 certificate in order to use TLS"
if [[ -z "$REDIS_SENTINEL_TLS_CA_DIR" ]]; then
print_validation_error "You must provide either a CA X.509 certificate or a CA certificates directory in order to use TLS"
elif [[ ! -d "$REDIS_SENTINEL_TLS_CA_DIR" ]]; then
print_validation_error "The CA certificates directory specified by path ${REDIS_SENTINEL_TLS_CA_DIR} does not exist"
fi
elif [[ ! -f "$REDIS_SENTINEL_TLS_CA_FILE" ]]; then
print_validation_error "The CA X.509 certificate file in the specified path ${REDIS_SENTINEL_TLS_CA_FILE} does not exist"
fi
Expand Down Expand Up @@ -247,7 +251,12 @@ redis_initialize() {
fi
redis_conf_set tls-cert-file "$REDIS_SENTINEL_TLS_CERT_FILE"
redis_conf_set tls-key-file "$REDIS_SENTINEL_TLS_KEY_FILE"
redis_conf_set tls-ca-cert-file "$REDIS_SENTINEL_TLS_CA_FILE"
if is_empty_value "$REDIS_SENTINEL_TLS_CA_FILE"; then
redis_conf_set tls-ca-cert-dir "$REDIS_SENTINEL_TLS_CA_DIR"
else
redis_conf_set tls-ca-cert-file "$REDIS_SENTINEL_TLS_CA_FILE"
fi

[[ -n "$REDIS_SENTINEL_TLS_DH_PARAMS_FILE" ]] && redis_conf_set tls-dh-params-file "$REDIS_SENTINEL_TLS_DH_PARAMS_FILE"
redis_conf_set tls-auth-clients "$REDIS_SENTINEL_TLS_AUTH_CLIENTS"
redis_conf_set tls-replication yes
Expand Down
2 changes: 2 additions & 0 deletions bitnami/redis-sentinel/7.4/debian-12/rootfs/opt/bitnami/scripts/redis-sentinel-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ redis_sentinel_env_vars=(
REDIS_SENTINEL_TLS_CERT_FILE
REDIS_SENTINEL_TLS_KEY_FILE
REDIS_SENTINEL_TLS_CA_FILE
REDIS_SENTINEL_TLS_CA_DIR
REDIS_SENTINEL_TLS_DH_PARAMS_FILE
REDIS_SENTINEL_TLS_AUTH_CLIENTS
REDIS_MASTER_HOST
Expand Down Expand Up @@ -112,6 +113,7 @@ export REDIS_SENTINEL_TLS_PORT_NUMBER="${REDIS_SENTINEL_TLS_PORT_NUMBER:-26379}"
export REDIS_SENTINEL_TLS_CERT_FILE="${REDIS_SENTINEL_TLS_CERT_FILE:-}"
export REDIS_SENTINEL_TLS_KEY_FILE="${REDIS_SENTINEL_TLS_KEY_FILE:-}"
export REDIS_SENTINEL_TLS_CA_FILE="${REDIS_SENTINEL_TLS_CA_FILE:-}"
export REDIS_SENTINEL_TLS_CA_DIR="${REDIS_SENTINEL_TLS_CA_DIR:-}"
export REDIS_SENTINEL_TLS_DH_PARAMS_FILE="${REDIS_SENTINEL_TLS_DH_PARAMS_FILE:-}"
export REDIS_SENTINEL_TLS_AUTH_CLIENTS="${REDIS_SENTINEL_TLS_AUTH_CLIENTS:-yes}"

Expand Down
1 change: 1 addition & 0 deletions bitnami/redis-sentinel/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ docker run -it --rm \
| `REDIS_SENTINEL_TLS_CERT_FILE` | Redis TLS certificate file | `nil` |
| `REDIS_SENTINEL_TLS_KEY_FILE` | Redis TLS key file | `nil` |
| `REDIS_SENTINEL_TLS_CA_FILE` | Redis TLS CA file | `nil` |
| `REDIS_SENTINEL_TLS_CA_DIR` | Directory containing TLS CA certificates | `nil` |
| `REDIS_SENTINEL_TLS_DH_PARAMS_FILE` | Redis TLS DH parameter file | `nil` |
| `REDIS_SENTINEL_TLS_AUTH_CLIENTS` | Enable Redis TLS client authentication | `yes` |
| `REDIS_MASTER_HOST` | Redis master host (used by slaves) | `redis` |
Expand Down
Loading