From 2744bb4a44d986fccb86adba669ee216cfec0dcc Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Mon, 13 Jul 2020 11:31:52 +0000
Subject: [PATCH] 6.15.2-6-debian-10-r13 release

---
 bitnami/ejbca/6/debian-10/Dockerfile          |  2 +-
 .../opt/bitnami/scripts/libpersistence.sh     |  6 +-
 .../opt/bitnami/scripts/libservice.sh         | 58 +++++++++++++++++++
 bitnami/ejbca/README.md                       |  2 +-
 4 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/bitnami/ejbca/6/debian-10/Dockerfile b/bitnami/ejbca/6/debian-10/Dockerfile
index 9e724d3bf1e7..0f76b5dd82d8 100644
--- a/bitnami/ejbca/6/debian-10/Dockerfile
+++ b/bitnami/ejbca/6/debian-10/Dockerfile
@@ -21,7 +21,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/ejbca/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="ejbca" \
-    BITNAMI_IMAGE_VERSION="6.15.2-6-debian-10-r12" \
+    BITNAMI_IMAGE_VERSION="6.15.2-6-debian-10-r13" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
index 6e42c882dbff..452c1f4b2831 100644
--- a/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
+++ b/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh
@@ -46,8 +46,9 @@ persist_app() {
         file_to_persist_relative="$(relativize "$file_to_persist" "$install_dir")"
         file_to_persist_destination="${persist_dir}/${file_to_persist_relative}"
         file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")"
-        # Get original permissions (except for the root directory, to avoid issues with volumes)
-        find "$file_to_persist_relative" | grep -E -v '^\.$' | xargs getfacl -R > "$tmp_file"
+        # Get original permissions for existing files, which will be applied later
+        # Exclude the root directory with 'sed', to avoid issues when copying the entirety of it to a volume
+        getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$tmp_file"
         # Copy directories to the volume
         ensure_dir_exists "$file_to_persist_destination_folder"
         cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder"
@@ -62,6 +63,7 @@ persist_app() {
         popd >/dev/null
     done
     popd >/dev/null
+    rm -f "$tmp_file"
     # Install the persisted files into the installation directory, via symlinks
     restore_persisted_app "$@"
 }
diff --git a/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
index cd68366f90ac..0fa91f65fc4f 100644
--- a/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/ejbca/6/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -68,6 +68,64 @@ stop_service_using_pid() {
     done
 }
 
+########################
+# Start cron daemon
+# Arguments:
+#   None
+# Returns:
+#   true if started correctly, false otherwise
+#########################
+cron_start() {
+    if [[ -x "/usr/sbin/cron" ]]; then
+        /usr/sbin/cron
+    elif [[ -x "/usr/sbin/crond" ]]; then
+        /usr/sbin/crond
+    else
+        false
+    fi
+}
+
+########################
+# Generate a cron configuration file for a given service
+# Arguments:
+#   $1 - Service name
+#   $2 - Command
+# Flags:
+#   --run-as - User to run as (default: root)
+#   --schedule - Cron schedule configuration (default: * * * * *)
+# Returns:
+#   None
+#########################
+generate_cron_conf() {
+    local service_name="${1:?service name is missing}"
+    local cmd="${2:?command is missing}"
+    local run_as="root"
+    local schedule="* * * * *"
+
+    # Parse optional CLI flags
+    shift 2
+    while [[ "$#" -gt 0 ]]; do
+        case "$1" in
+            --run-as)
+                shift
+                run_as="$1"
+                ;;
+            --schedule)
+                shift
+                schedule="$1"
+                ;;
+            *)
+                echo "Invalid command line flag ${1}" >&2
+                return 1
+                ;;
+        esac
+        shift
+    done
+
+    mkdir -p /etc/cron.d
+    echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name"
+}
+
 ########################
 # Generate a monit configuration file for a given service
 # Arguments:
diff --git a/bitnami/ejbca/README.md b/bitnami/ejbca/README.md
index a9fe6af6e20a..ae049a186202 100644
--- a/bitnami/ejbca/README.md
+++ b/bitnami/ejbca/README.md
@@ -35,7 +35,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`6-debian-10`, `6.15.2-6-debian-10-r12`, `6`, `6.15.2-6`, `latest` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ejbca/blob/6.15.2-6-debian-10-r12/6/debian-10/Dockerfile)
+* [`6-debian-10`, `6.15.2-6-debian-10-r13`, `6`, `6.15.2-6`, `latest` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ejbca/blob/6.15.2-6-debian-10-r13/6/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/ejbca GitHub repo](https://github.com/bitnami/bitnami-docker-ejbca).