From 29b19fee09838cafab32528ca0d63ef91b1af2e4 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 28 Mar 2023 01:24:40 +0200
Subject: [PATCH] [bitnami/rabbitmq] Release 3.10.20-debian-11-r1 (#28451)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/rabbitmq/3.10/debian-11/Dockerfile    |  4 ++--
 .../opt/bitnami/.bitnami_components.json      |  3 ---
 .../opt/bitnami/scripts/libwebserver.sh       | 24 +++++++++++++++----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/bitnami/rabbitmq/3.10/debian-11/Dockerfile b/bitnami/rabbitmq/3.10/debian-11/Dockerfile
index 6e38f243272c..dd014d87cbc8 100644
--- a/bitnami/rabbitmq/3.10/debian-11/Dockerfile
+++ b/bitnami/rabbitmq/3.10/debian-11/Dockerfile
@@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-03-22T19:04:10Z" \
+      org.opencontainers.image.created="2023-03-27T22:46:30Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.10.20-debian-11-r0" \
+      org.opencontainers.image.ref.name="3.10.20-debian-11-r1" \
       org.opencontainers.image.title="rabbitmq" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.10.20"
diff --git a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 0ef45e0eb773..0acc63bce514 100644
--- a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,21 +1,18 @@
 {
     "erlang": {
         "arch": "amd64",
-        "digest": "96cba0cf22e440e2ebd3e6e6e1c3457d29b83cba03978671974504bb19e34578",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "25.3.0-1"
     },
     "gosu": {
         "arch": "amd64",
-        "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "1.16.0-3"
     },
     "rabbitmq": {
         "arch": "amd64",
-        "digest": "9690af74a6b129b5837ed3b6643282999e6d7623735897c7e00bee879187add3",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "3.10.20-0"
diff --git a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 818c2158032b..5860791219cf 100644
--- a/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/rabbitmq/3.10/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -112,7 +112,11 @@ is_web_server_running() {
 #########################
 web_server_start() {
     info "Starting $(web_server_type) in background"
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
+    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
+    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+        systemctl start "bitnami.$(web_server_type).service"
+    fi
 }
 
 ########################
@@ -126,7 +130,11 @@ web_server_start() {
 #########################
 web_server_stop() {
     info "Stopping $(web_server_type)"
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
+    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
+    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+        systemctl stop "bitnami.$(web_server_type).service"
+    fi
 }
 
 ########################
@@ -140,7 +148,11 @@ web_server_stop() {
 #########################
 web_server_restart() {
     info "Restarting $(web_server_type)"
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
+    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
+    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+        systemctl restart "bitnami.$(web_server_type).service"
+    fi
 }
 
 ########################
@@ -153,7 +165,11 @@ web_server_restart() {
 #   None
 #########################
 web_server_reload() {
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
+    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
+    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+        systemctl reload "bitnami.$(web_server_type).service"
+    fi
 }
 
 ########################