From d7250df618ec97c9a1f422f5cac67fe04f5e9172 Mon Sep 17 00:00:00 2001 From: Tone Date: Wed, 27 Apr 2022 17:43:36 +0200 Subject: [PATCH] RABBITMQ: Set RABBITMQ_LOGS env variable default to empty (#202) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * RABBITMQ: Set RABBITMQ_LOGS env variable default to empty To setup `log.console`/`log.file` in RabbitMQ configuration, it is needed to set the environment variable `RABBITMQ_LOGS` to be empty. By default, the bitnami Helm chart set the default already to `-`. Signed-off-by: Anthony Hausman * Add RABBITMQ_LOGS env variable to docker-compose Signed-off-by: Anthony Hausman Co-authored-by: Javier J. Salmerón-García --- .../3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh | 2 -- .../3.9/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh | 4 ---- bitnami/rabbitmq/docker-compose-cluster.yml | 1 + bitnami/rabbitmq/docker-compose-ldap.yml | 1 + bitnami/rabbitmq/docker-compose.yml | 1 + 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh b/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh index 79c9dae86d80..fe8b41fd41b9 100644 --- a/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh +++ b/bitnami/rabbitmq/3.8/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh @@ -150,8 +150,6 @@ export RABBITMQ_LDAP_USER_DN_PATTERN="${RABBITMQ_LDAP_USER_DN_PATTERN:-}" # RabbitMQ native environment variables (see https://www.rabbitmq.com/relocate.html) export RABBITMQ_MNESIA_BASE="$RABBITMQ_DATA_DIR" -# Print all log messages to standard output - # SSL/TLS configuration export RABBITMQ_NODE_SSL_PORT_NUMBER="${RABBITMQ_NODE_SSL_PORT_NUMBER:-5671}" RABBITMQ_SSL_CACERTFILE="${RABBITMQ_SSL_CACERTFILE:-"${RABBITMQ_SSL_CACERT_FILE:-}"}" diff --git a/bitnami/rabbitmq/3.9/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh b/bitnami/rabbitmq/3.9/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh index b4208924b191..fe8b41fd41b9 100644 --- a/bitnami/rabbitmq/3.9/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh +++ b/bitnami/rabbitmq/3.9/debian-10/rootfs/opt/bitnami/scripts/rabbitmq-env.sh @@ -49,7 +49,6 @@ rabbitmq_env_vars=( RABBITMQ_LDAP_SERVERS RABBITMQ_LDAP_SERVERS_PORT RABBITMQ_LDAP_USER_DN_PATTERN - RABBITMQ_LOGS RABBITMQ_NODE_SSL_PORT_NUMBER RABBITMQ_SSL_CACERTFILE RABBITMQ_SSL_CERTFILE @@ -151,9 +150,6 @@ export RABBITMQ_LDAP_USER_DN_PATTERN="${RABBITMQ_LDAP_USER_DN_PATTERN:-}" # RabbitMQ native environment variables (see https://www.rabbitmq.com/relocate.html) export RABBITMQ_MNESIA_BASE="$RABBITMQ_DATA_DIR" -# Print all log messages to standard output -export RABBITMQ_LOGS="${RABBITMQ_LOGS:--}" - # SSL/TLS configuration export RABBITMQ_NODE_SSL_PORT_NUMBER="${RABBITMQ_NODE_SSL_PORT_NUMBER:-5671}" RABBITMQ_SSL_CACERTFILE="${RABBITMQ_SSL_CACERTFILE:-"${RABBITMQ_SSL_CACERT_FILE:-}"}" diff --git a/bitnami/rabbitmq/docker-compose-cluster.yml b/bitnami/rabbitmq/docker-compose-cluster.yml index 7d73f1dc1a6d..54eb40245d2e 100644 --- a/bitnami/rabbitmq/docker-compose-cluster.yml +++ b/bitnami/rabbitmq/docker-compose-cluster.yml @@ -7,6 +7,7 @@ services: - RABBITMQ_NODE_NAME=rabbit@stats - RABBITMQ_ERL_COOKIE=s3cr3tc00ki3 - RABBITMQ_SECURE_PASSWORD=yes + - RABBITMQ_LOGS=- ports: - '15672:15672' volumes: diff --git a/bitnami/rabbitmq/docker-compose-ldap.yml b/bitnami/rabbitmq/docker-compose-ldap.yml index 07530d0e913a..d64577b1cc7d 100644 --- a/bitnami/rabbitmq/docker-compose-ldap.yml +++ b/bitnami/rabbitmq/docker-compose-ldap.yml @@ -21,6 +21,7 @@ services: - RABBITMQ_LDAP_SERVERS=openldap - RABBITMQ_LDAP_SERVERS_PORT=1389 - RABBITMQ_LDAP_USER_DN_PATTERN=cn=$${username},ou=users,dc=example,dc=org + - RABBITMQ_LOGS=- openldap: image: 'docker.io/bitnami/openldap:latest' ports: diff --git a/bitnami/rabbitmq/docker-compose.yml b/bitnami/rabbitmq/docker-compose.yml index 9f5038416869..55e8575cb66c 100644 --- a/bitnami/rabbitmq/docker-compose.yml +++ b/bitnami/rabbitmq/docker-compose.yml @@ -12,6 +12,7 @@ services: - '15672:15672' environment: - RABBITMQ_SECURE_PASSWORD=yes + - RABBITMQ_LOGS=- volumes: - 'rabbitmq_data:/bitnami/rabbitmq/mnesia' volumes: