diff --git a/bitnami/drupal-nginx/8/debian-10/Dockerfile b/bitnami/drupal-nginx/8/debian-10/Dockerfile index eaf79173d009..99a2a9828c03 100644 --- a/bitnami/drupal-nginx/8/debian-10/Dockerfile +++ b/bitnami/drupal-nginx/8/debian-10/Dockerfile @@ -25,7 +25,7 @@ RUN /opt/bitnami/scripts/drupal/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ BITNAMI_APP_NAME="drupal-nginx" \ - BITNAMI_IMAGE_VERSION="8.9.18-debian-10-r18" \ + BITNAMI_IMAGE_VERSION="8.9.18-debian-10-r19" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/drupal-nginx/8/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/drupal-nginx/8/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh index ae8f310137d2..0b96a0be09e0 100644 --- a/bitnami/drupal-nginx/8/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/drupal-nginx/8/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -137,6 +137,19 @@ generate_cron_conf() { fi } +######################## +# Remove a cron configuration file for a given service +# Arguments: +# $1 - Service name +# Returns: +# None +######################### +remove_cron_conf() { + local service_name="${1:?service name is missing}" + local cron_conf_dir="/etc/monit/conf.d" + rm -f "${cron_conf_dir}/${service_name}" +} + ######################## # Generate a monit configuration file for a given service # Arguments: @@ -183,6 +196,19 @@ check process ${service_name} EOF } +######################## +# Remove a monit configuration file for a given service +# Arguments: +# $1 - Service name +# Returns: +# None +######################### +remove_monit_conf() { + local service_name="${1:?service name is missing}" + local monit_conf_dir="/etc/monit/conf.d" + rm -f "${monit_conf_dir}/${service_name}.conf" +} + ######################## # Generate a logrotate configuration file # Arguments: @@ -233,3 +259,16 @@ $(indent "$extra" 2) } EOF } + +######################## +# Remove a logrotate configuration file +# Arguments: +# $1 - Service name +# Returns: +# None +######################### +remove_logrotate_conf() { + local service_name="${1:?service name is missing}" + local logrotate_conf_dir="/etc/logrotate.d" + rm -f "${logrotate_conf_dir}/${service_name}" +} diff --git a/bitnami/drupal-nginx/8/debian-10/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/drupal-nginx/8/debian-10/rootfs/opt/bitnami/scripts/libnginx.sh index 9f659fb496f1..17a0ccbf7928 100644 --- a/bitnami/drupal-nginx/8/debian-10/rootfs/opt/bitnami/scripts/libnginx.sh +++ b/bitnami/drupal-nginx/8/debian-10/rootfs/opt/bitnami/scripts/libnginx.sh @@ -144,7 +144,7 @@ nginx_initialize() { if [[ -n "${NGINX_DAEMON_USER:-}" ]]; then chown -R "${NGINX_DAEMON_USER:-}" "$NGINX_TMP_DIR" fi - nginx_user_configuration="$(sed -E "s/^(user\s+).*/\1 ${NGINX_DAEMON_USER:-} ${NGINX_DAEMON_GROUP:-};/g" "$NGINX_CONF_FILE")" + nginx_user_configuration="$(sed -E "s/^(user\s+).*/\1${NGINX_DAEMON_USER:-} ${NGINX_DAEMON_GROUP:-};/g" "$NGINX_CONF_FILE")" is_file_writable "$NGINX_CONF_FILE" && echo "$nginx_user_configuration" > "$NGINX_CONF_FILE" else # The "user" directive makes sense only if the master process runs with super-user privileges diff --git a/bitnami/drupal-nginx/README.md b/bitnami/drupal-nginx/README.md index 68be0028aa4b..dcaceb0b733d 100644 --- a/bitnami/drupal-nginx/README.md +++ b/bitnami/drupal-nginx/README.md @@ -43,7 +43,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`9`, `9-debian-10`, `9.2.5`, `9.2.5-debian-10-r5`, `latest` (9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/9.2.5-debian-10-r5/9/debian-10/Dockerfile) -* [`8`, `8-debian-10`, `8.9.18`, `8.9.18-debian-10-r18` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/8.9.18-debian-10-r18/8/debian-10/Dockerfile) +* [`8`, `8-debian-10`, `8.9.18`, `8.9.18-debian-10-r19` (8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal-nginx/blob/8.9.18-debian-10-r19/8/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/drupal-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-drupal-nginx).