From 9d6b9ef525f741e971a731d22ffab8de6eefc33e Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 28 Mar 2023 16:09:38 +0200
Subject: [PATCH] [bitnami/ejbca] Release 7.11.0-debian-11-r20 (#28618)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/ejbca/7/debian-11/Dockerfile          |  4 ++--
 .../opt/bitnami/.bitnami_components.json      |  5 ----
 .../opt/bitnami/scripts/libservice.sh         |  2 +-
 .../opt/bitnami/scripts/libwebserver.sh       | 24 +++++++++++++++----
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/bitnami/ejbca/7/debian-11/Dockerfile b/bitnami/ejbca/7/debian-11/Dockerfile
index 45df62f87ef3..674489a47779 100644
--- a/bitnami/ejbca/7/debian-11/Dockerfile
+++ b/bitnami/ejbca/7/debian-11/Dockerfile
@@ -4,10 +4,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-03-22T07:06:10Z" \
+      org.opencontainers.image.created="2023-03-28T12:44:09Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.11.0-debian-11-r19" \
+      org.opencontainers.image.ref.name="7.11.0-debian-11-r20" \
       org.opencontainers.image.title="ejbca" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="7.11.0"
diff --git a/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 92372c440d63..40ac7e117e48 100644
--- a/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,35 +1,30 @@
 {
     "ejbca": {
         "arch": "amd64",
-        "digest": "538b548432bd1b85250733c0abfa56cd8c639661216b466d910ec43531e8af8b",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "7.11.0-2"
     },
     "gosu": {
         "arch": "amd64",
-        "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "1.16.0-3"
     },
     "java": {
         "arch": "amd64",
-        "digest": "fbdf266273a4dd4c5fc37c344462aa50047549aa2e63858ffee5594ea450fca5",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "11.0.18-10-3"
     },
     "mysql-client": {
         "arch": "amd64",
-        "digest": "6ed7c73b5e779521cf2f47a00ac54e6d2929213cb4eb3cbd9a4f12f84557c664",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "10.6.12-2"
     },
     "wildfly": {
         "arch": "amd64",
-        "digest": "d3846e48d559528a779072a0d10f4b34b031cf820a9b412a46a38d1f9a223b7c",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "26.1.3-5"
diff --git a/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index 2d4b7af6fd3a..6fcb304d34cc 100644
--- a/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -395,7 +395,7 @@ PartOf=bitnami.service
 Type=${type}
 EOF
     if [[ -n "$working_directory" ]]; then
-        cat >> "$service_file" <<< "WorkingDirectory=$working_directory"
+        cat >> "$service_file" <<< "WorkingDirectory=${working_directory}"
     fi
     if [[ -n "$exec_start_pre" ]]; then
         # This variable may contain multiple ExecStartPre= directives
diff --git a/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 818c2158032b..5860791219cf 100644
--- a/bitnami/ejbca/7/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/ejbca/7/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
 }
 
 ########################