From 51fed58bd3f5ea8b1ee6ca99db5a1b4df6bf5694 Mon Sep 17 00:00:00 2001
From: Patrick Hobusch <patrick@hobusch.net>
Date: Fri, 24 Mar 2023 14:32:21 +0800
Subject: [PATCH] Provide custom scripts for watching configs, install
 inotify-tools

In order to be able to automatically reload the Apache webserver
gracefully when Apache config changes, a custom script for watching the
config has been provided. This script is now started as a background
process by a modified run script. Like this, the config watcher
automatically gets started everytime the Apache webserver gets started
too.

As the config watcher is based on the inotifywait command, the package
inotify-tools has been installed in the container.
---
 Dockerfile              |  8 ++++++++
 scripts/run.sh          | 23 +++++++++++++++++++++++
 scripts/watch-config.sh | 19 +++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100755 scripts/run.sh
 create mode 100755 scripts/watch-config.sh

diff --git a/Dockerfile b/Dockerfile
index 5c768a1..b286599 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,4 +34,12 @@ RUN wget "https://github.com/latchset/mod_auth_mellon/releases/download/v${MOD_A
     make install && \
     rm -rf /tmp/mod_auth_mellon*
 
+# install generic packages (keep separated in case we want to use builder image)
+RUN apt-get update && apt-get install -y \
+        inotify-tools \
+    && rm -rf /var/lib/apt/lists/*
+
+# add (and override) scripts to scripts in upstream image
+COPY ./scripts /opt/bitnami/scripts/apache/
+
 USER www-data
diff --git a/scripts/run.sh b/scripts/run.sh
new file mode 100755
index 0000000..0b810e3
--- /dev/null
+++ b/scripts/run.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+
+set -o errexit
+set -o nounset
+set -o pipefail
+# set -o xtrace # Uncomment this line for debugging purposes
+
+# Load libraries
+. /opt/bitnami/scripts/libapache.sh
+. /opt/bitnami/scripts/liblog.sh
+
+# Load Apache environment
+. /opt/bitnami/scripts/apache-env.sh
+
+# Watch for changes in the conf directory
+info "** Starting Apache config watcher **"
+/opt/bitnami/scripts/apache/watch-config.sh &
+info "** Apache config watcher started in background! **"
+
+info "** Starting Apache **"
+exec "${APACHE_BIN_DIR}/httpd" -f "$APACHE_CONF_FILE" -D "FOREGROUND"
diff --git a/scripts/watch-config.sh b/scripts/watch-config.sh
new file mode 100755
index 0000000..d56d292
--- /dev/null
+++ b/scripts/watch-config.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# Load libraries
+. /opt/bitnami/scripts/libapache.sh
+. /opt/bitnami/scripts/libbitnami.sh
+. /opt/bitnami/scripts/liblog.sh
+
+# Load Apache environment
+. /opt/bitnami/scripts/apache-env.sh
+
+mkdir -p conf
+
+while inotifywait -e create,delete,modify,move -r conf; do
+    /opt/bitnami/scripts/apache/reload.sh;
+done