From 42cbd1853a384eeaf280c23f4f87e151e724b6d2 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 10 Apr 2023 23:17:54 +0200 Subject: [PATCH] [bitnami/mediawiki] Release 1.39.3-debian-11-r3 (#29834) Signed-off-by: Bitnami Containers --- bitnami/mediawiki/1/debian-11/Dockerfile | 4 ++-- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++---------- .../bitnami/scripts/mediawiki/updatehost.sh | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bitnami/mediawiki/1/debian-11/Dockerfile b/bitnami/mediawiki/1/debian-11/Dockerfile index 59e1a19af6f0..d589578909fe 100644 --- a/bitnami/mediawiki/1/debian-11/Dockerfile +++ b/bitnami/mediawiki/1/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-04-07T14:56:11Z" \ + org.opencontainers.image.created="2023-04-10T20:15:12Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.39.3-debian-11-r2" \ + org.opencontainers.image.ref.name="1.39.3-debian-11-r3" \ org.opencontainers.image.title="mediawiki" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.39.3" diff --git a/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 5860791219cf..94745ebe419e 100644 --- a/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -112,10 +112,10 @@ is_web_server_running() { ######################### web_server_start() { info "Starting $(web_server_type) in background" - if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" - elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then systemctl start "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" fi } @@ -130,10 +130,10 @@ web_server_start() { ######################### web_server_stop() { info "Stopping $(web_server_type)" - if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" - elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then systemctl stop "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" fi } @@ -148,10 +148,10 @@ web_server_stop() { ######################### web_server_restart() { info "Restarting $(web_server_type)" - if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" - elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then systemctl restart "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" fi } @@ -165,10 +165,10 @@ web_server_restart() { # None ######################### web_server_reload() { - if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" - elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then systemctl reload "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" fi } diff --git a/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/mediawiki/updatehost.sh b/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/mediawiki/updatehost.sh index 24ff881ea14a..5f93d2e210ee 100755 --- a/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/mediawiki/updatehost.sh +++ b/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/mediawiki/updatehost.sh @@ -19,7 +19,7 @@ MEDIAWIKI_SERVER_HOST="${1:?missing host}" mediawiki_configure_host "$MEDIAWIKI_SERVER_HOST" # Reload PHP-FPM configuration to ensure that the home page redirects to the new domain -if [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then +if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then systemctl reload bitnami.php-fpm.service else /opt/bitnami/scripts/php/reload.sh