From a1bced82aa7819c786b0c96f6c1441856c5ca3a7 Mon Sep 17 00:00:00 2001 From: Baumann Fabrice Date: Thu, 28 Oct 2021 09:23:26 -0400 Subject: [PATCH] bugfix: AIRFLOW_REDIS_USE_SSL is used to control database SSL option (#16) Co-authored-by: Fabrice Baumann --- .../1/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh | 4 ++-- .../2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bitnami/airflow-worker/1/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow-worker/1/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh index 21e78899e553..df42e00100f6 100644 --- a/bitnami/airflow-worker/1/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh +++ b/bitnami/airflow-worker/1/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh @@ -334,7 +334,7 @@ airflow_configure_database() { local -r user=$(airflow_encode_url "$AIRFLOW_DATABASE_USERNAME") local -r password=$(airflow_encode_url "$AIRFLOW_DATABASE_PASSWORD") local extra_options - is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && extra_options="?sslmode=require" + is_boolean_yes "$AIRFLOW_DATABASE_USE_SSL" && extra_options="?sslmode=require" info "Configuring Airflow database" airflow_conf_set "core" "sql_alchemy_conn" "postgresql+psycopg2://${user}:${password}@${AIRFLOW_DATABASE_HOST}:${AIRFLOW_DATABASE_PORT_NUMBER}/${AIRFLOW_DATABASE_NAME}${extra_options:-}" @@ -395,7 +395,7 @@ airflow_configure_celery_executor() { local -r database_user=$(airflow_encode_url "$AIRFLOW_DATABASE_USERNAME") local -r database_password=$(airflow_encode_url "$AIRFLOW_DATABASE_PASSWORD") local database_extra_options - is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && database_extra_options="?sslmode=require" + is_boolean_yes "$AIRFLOW_DATABASE_USE_SSL" && database_extra_options="?sslmode=require" airflow_conf_set "celery" "result_backend" "db+postgresql://${database_user}:${database_password}@${AIRFLOW_DATABASE_HOST}:${AIRFLOW_DATABASE_PORT_NUMBER}/${AIRFLOW_DATABASE_NAME}${database_extra_options:-}" } diff --git a/bitnami/airflow-worker/2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow-worker/2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh index 21e78899e553..df42e00100f6 100644 --- a/bitnami/airflow-worker/2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh +++ b/bitnami/airflow-worker/2/debian-10/rootfs/opt/bitnami/scripts/libairflow.sh @@ -334,7 +334,7 @@ airflow_configure_database() { local -r user=$(airflow_encode_url "$AIRFLOW_DATABASE_USERNAME") local -r password=$(airflow_encode_url "$AIRFLOW_DATABASE_PASSWORD") local extra_options - is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && extra_options="?sslmode=require" + is_boolean_yes "$AIRFLOW_DATABASE_USE_SSL" && extra_options="?sslmode=require" info "Configuring Airflow database" airflow_conf_set "core" "sql_alchemy_conn" "postgresql+psycopg2://${user}:${password}@${AIRFLOW_DATABASE_HOST}:${AIRFLOW_DATABASE_PORT_NUMBER}/${AIRFLOW_DATABASE_NAME}${extra_options:-}" @@ -395,7 +395,7 @@ airflow_configure_celery_executor() { local -r database_user=$(airflow_encode_url "$AIRFLOW_DATABASE_USERNAME") local -r database_password=$(airflow_encode_url "$AIRFLOW_DATABASE_PASSWORD") local database_extra_options - is_boolean_yes "$AIRFLOW_REDIS_USE_SSL" && database_extra_options="?sslmode=require" + is_boolean_yes "$AIRFLOW_DATABASE_USE_SSL" && database_extra_options="?sslmode=require" airflow_conf_set "celery" "result_backend" "db+postgresql://${database_user}:${database_password}@${AIRFLOW_DATABASE_HOST}:${AIRFLOW_DATABASE_PORT_NUMBER}/${AIRFLOW_DATABASE_NAME}${database_extra_options:-}" }