Configuration for WordPress is working but still a few things to tweak, test, and enhance.

Reviewed-on: #11

.gitignore

@@ -25,6 +25,8 @@ Config/DNS/config/*
 
 # Ignore anything in disabled folders.
 disabled
+*.disabled
+disabled.*
 
 # Ignore any .env files which are not explicitly committed to the project.
 *.env
@@ -35,5 +37,16 @@ docker-compose.yml
 # 2024-01-24 Hide static files for Hyperling.com.
 Config/Hyperling.com/files/*
 
-# Ignore things like Config/Hyperling.com-Stage/
+# Ignore things like "Config/Hyperling.com-Stage/"
 *-Stage
+Stage-*
+
+# Ignore copies of the Hugo configuration, such as "Config/Hugo-MyWebsite".
+Hugo-*
+*-Hugo
+
+# Ignore Prod and Dev copies as well.
+*-Prod
+Prod-*
+*-Dev
+Dev-*

Config/HugoExample/Dockerfile

@@ -0,0 +1,35 @@
+# 2025-08-13 Hyperling
+
+## Image ##
+FROM debian:bookworm-slim
+
+## Setup ##
+# System Dependencies
+RUN apt-get update && apt-get install -y git hugo nginx cron curl bash sudo htop
+
+# User and Group
+#RUN groupadd -r hugo && useradd -r -g hugo hugo
+
+# Hugo Directory Tree
+RUN mkdir -pv /var/www/hugo/
+
+# NGINX Directory Tree
+RUN mkdir -pv /var/www/html/
+
+# Copy Cron Job to Update Git Repo
+COPY files/crontab /etc/crontab
+COPY files/cronjob.sh /var/www/hugo/cronjob.sh
+
+# Hugo User Permissions
+RUN chown -Rv www-data:www-data /var/www/
+RUN chmod +x /var/www/hugo/cronjob.sh
+
+# Copy Start Script
+COPY files/main.sh /root/main.sh
+RUN chmod +x /root/main.sh
+
+## Main ##
+# Install + Run Website
+WORKDIR /var/www/
+USER root
+CMD /root/main.sh "$REPO" "$BRANCH" "$PROD" "$DEV"

Config/HugoExample/docker-compose.example.yml

@@ -0,0 +1,30 @@
+# 2025-08-13
+# Configuration for running a Hugo website pulled from Git.
+
+services:
+  app:
+    container_name: hugo
+    build:
+      context: ./
+      network: host
+    restart: always
+    ports:
+      - 8013:80   # Production minified files served using NGINX.
+      - 1380:1380 # Development files with drafts served by Hugo Server.
+    environment:
+      - REPO=$REPO
+      - BRANCH=$BRANCH
+      - PROD=$PROD
+      - DEV=$DEV
+    healthcheck:
+      test: curl -sS http://localhost:80 || curl -sS http://localhost:1380 || exit 1
+      interval: 1m
+      timeout: 10s
+      retries: 2
+      start_period: 30s
+    deploy:
+      mode: global
+      resources:
+        limits:
+          cpus: '0.10'
+          memory: 64M

Config/HugoExample/env.example

@@ -0,0 +1,22 @@
+# 2025-08-13 Hyperling
+
+#
+## Docker ##
+#
+COMPOSE_BAKE=true
+
+#
+## Git Website Repository
+#
+REPO=https://git.hyperling.com/me/hugo-jackanope
+BRANCH=main
+
+#
+## Web Environments
+# Please use values YES/TRUE and NO/FALSE.
+
+# Whether to start NGINX
+PROD=YES
+
+# Whether to start Hugo Server
+DEV=NO

Config/HugoExample/files/cronjob.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+cd /var/www/hugo/site
+
+echo "*** Running cronjob @ `date` ***"
+
+# Pull any updates, and if the project is already up to date, exit successfully.
+git pull | grep -v "up to date"
+status="$?"
+echo "* Pull status is '$status'."
+if [[ $status != 0 && -e /var/www/html/index.html ]]; then
+	echo "* Site is already up to date and copied, exiting."
+	exit 0
+fi
+
+# If the project was not already up to date, build the new files for NGINX.
+hugo --gc --minify
+status="$?"
+echo "* Hugo status is '$status'."
+if [[ $status == 0 && -e public/index.html ]]; then
+	echo "* Copying files..."
+	rm -rfv /var/www/html/*
+	mv -v public/* /var/www/html/
+fi
+
+exit 0

Config/HugoExample/files/crontab

@@ -0,0 +1 @@
+* * * * * www-data /var/www/hugo/cronjob.sh

Config/HugoExample/files/main.sh

@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+
+REPO="$1"
+echo "REPO='$REPO'"
+
+BRANCH="$2"
+if [[ -n $BRANCH ]]; then
+	BRANCH="--branch $BRANCH"
+fi
+echo "BRANCH='$BRANCH'"
+
+PROD="$3"
+typeset -u PROD
+echo "PROD='$PROD'"
+
+DEV="$4"
+typeset -u DEV
+echo "DEV='$DEV'"
+
+SITE="/var/www/hugo/site"
+
+echo "*** Creating Git Repo ***"
+if [[ -d $SITE ]]; then
+	rm -rfv $SITE
+fi
+sudo -u www-data git clone --recurse-submodules $BRANCH $REPO $SITE
+status="$?"
+
+echo "*** Validating Git Repo ***"
+if [[ $status != 0 || ! -d $SITE/.git ]]; then
+	echo "ERROR: Hugo project may not have cloned correctly. status='$status'"
+	echo "Aborting."
+	exit 1
+fi
+echo "* Site exists!"
+
+echo "*** Copying Static Files to NGINX ***"
+rm -rfv /var/www/html/*
+sudo -u www-data /var/www/hugo/cronjob.sh
+
+echo "*** Starting Cron ***"
+service cron start
+service cron status
+
+if [[ "$PROD" == "Y"* || "$PROD" == "T"*  ]]; then
+	echo "*** Starting Production Server Loop ***"
+
+	while true; do
+		http_code="`curl -sS http://localhost:80 -o /dev/null -w "%{http_code}"`"
+		if [[ $http_code != 200 ]]; then
+			echo "* Prod server not detected, starting..."
+			service nginx status
+			service nginx start
+			service nginx status
+		fi
+		sleep 15
+	done &
+
+	cd /var/log/nginx
+	tail -f access.log error.log &
+fi
+
+if [[ "$DEV" == "Y"* || "$DEV" == "T"* ]]; then
+	echo "*** Starting Development Server Loop ***"
+
+	while true; do
+		http_code="`curl -sS http://localhost:1380 -o /dev/null -w "%{http_code}"`"
+		if [[ $http_code != 200 ]]; then
+			echo "* Dev server not detected, starting..."
+			cd $SITE
+			killall hugo 2>/dev/null
+			sudo -u www-data hugo server -D --noBuildLock --bind 0.0.0.0 -p 1380 &
+		fi
+		sleep 30
+	done &
+fi
+
+echo "*** Following Mail Files ***"
+cd /var/mail
+touch mail www-data
+chown -v mail:mail mail
+chown -v www-data:mail www-data
+chmod -v 660 mail www-data
+tail -f mail www-data &
+
+cd
+
+echo "*** Finished $0 @ `date` ***"
+
+wait -n
+
+exit $?

Config/Hyperling.com/Dockerfile

@@ -6,20 +6,28 @@
 FROM node:lts-slim
 
 # Cache System Dependencies
-RUN apt-get update && apt-get install -y git php-cli
+RUN apt-get update && apt-get install -y git php-cli sudo curl procps
 
 # Cache Node Dependencies
 RUN mkdir -p /var/www/api
 WORKDIR /var/www/api
-RUN echo '{ "dependencies": { "express": "" } }' > package.json
+RUN echo '{ "dependencies": { "express": ">=4.18.1 < 5.0.0" } }' > package.json
 RUN npm install
 
 # Install + Run Website
 CMD cd /var/www/api && \
-    rm -rfv pages main.js run.sh && \
-    git clone https://git.hyperling.com/me/nodejs-website website && \
-    rm -rfv website/files && \
-    mv -v website/* ./ && \
+    echo "Dockerfile: Ensure symlink is properly deleted if it exists..." && \
+    ls -l website/files; rm -v website/files; sleep 0 && \
+    echo "Dockerfile: Clone the website's Git repo..." && \
     rm -rfv website && \
-    echo "Starting Website" && \
+    git clone https://git.hyperling.com/me/nodejs-website $BRANCH website && \
+    echo "Dockerfile: Remove dummy files and replace with symlink..." && \
+    rm -rfv website/files && \
+    cd website && \
+    echo -n "Dockerfile: Using branch " && \
+    git branch && \
+    ln -sv ../files ./files && \
+    echo "Dockerfile: Allow files under files/ to be ignored by Git..." && \
+    find ./files -exec git update-index --assume-unchanged {} \; && \
+    echo "Dockerfile: Start website!" && \
     ./run.sh

Config/Hyperling.com/docker-compose.main.yml

@@ -10,11 +10,15 @@ services:
     restart: always
     ports:
       - 8317:8080
+    environment:
+      - BRANCH=$BRANCH
+      - CPU=$CPU
+      - MEM=$MEM
     volumes:
       - ./files:/var/www/api/files
     deploy:
       mode: global
       resources:
         limits:
-          cpus: '0.25'
-          memory: 256M
+          cpus: $CPU
+          memory: $MEM

Config/Hyperling.com/docker-compose.micro.yml

@@ -1,21 +0,0 @@
-# 2022-10-29
-# Hyperling.com configuration.
-# 2023-01-24 container needs 128M to get started fully then settles to 25M.
-
-services:
-  app:
-    container_name: www-app
-    build:
-      context: ./
-      network: host
-    restart: always
-    ports:
-      - 8317:8080
-    volumes:
-      - ./files:/var/www/api/files
-    deploy:
-      mode: global
-      resources:
-        limits:
-          cpus: '0.10'
-          memory: 128M

Config/Hyperling.com/env.main

@@ -0,0 +1,24 @@
+# This file should be renamed '.env' and have any private values modified.
+
+## 2025-06-16
+## Performance Notes for Enabling BAKE
+# Compose by itself takes about 35s to build this project.
+# Enabling this setting first cause the build to take 80s.
+# Subsequent builds consistently take less than 2 seconds.
+# Testing was done on the micro server, not a workstation.
+COMPOSE_BAKE=true
+
+## Branch ##
+# Allow choosing the branch. By leaving it blank, the main branch will be used.
+# Should be in the full "--branch my-branch" syntax.
+BRANCH=
+#BRANCH="--branch dev"
+
+## Performance ##
+# Standard Server
+CPU=0.25
+MEM=0.25G
+# Micro Server
+# 2023-01-24 container needs 128M to get started fully then settles to 25M.
+#CPU=0.10
+#MEM=128M

Config/LibreTranslate/Dockerfile

@@ -0,0 +1,3 @@
+# Install and run LibreTranslate
+
+FROM libretranslate/libretranslate:latest

Config/LibreTranslate/README.md

@@ -0,0 +1,31 @@
+# LibreTranslate Configuration
+
+## Install
+
+1. Copy `env.example` to `.env` and adjust the values as necessary.
+
+```
+cd $DOCKER_HOME/Config/LibreTranslate
+cp env.example .env
+vi .env
+```
+
+2. Run the `prep.sh` file to create the volume mounts.
+
+```
+./prep.sh
+```
+
+3. If using a temporary location for `models/` such as `/tmp/`, ensure
+that the reboot script is in `root`'s crontab to set the folders back up.
+
+```
+@reboot /opt/Docker/Config/LibreTranslate/cron-reboot.sh
+```
+
+4. Start the container up as normal.
+
+```
+cp docker-compose.main.yml docker-compose.yml
+docker compose up -d
+```

Config/LibreTranslate/cron-reboot.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# 2025-07-26 Hyperling
+# Ensure the LibreTranslate container starts correctly after a reboot, especially if placing models/ under /tmp/.
+
+## Setup ##
+
+DIR="$(dirname -- "${BASH_SOURCE[0]}")"
+cd $DIR
+source ./.env
+
+## Main ##
+
+# Shutdown the container.
+docker compose down
+
+# Create folders.
+./prep.sh
+
+# Start the container.
+docker compose up -d
+
+# Finish successfully.
+exit 0

Config/LibreTranslate/docker-compose.main.yml

@@ -0,0 +1,55 @@
+# LibreTranslate configuration.
+# Example docker-compose.yml:
+#   https://github.com/LibreTranslate/LibreTranslate/blob/main/docker-compose.yml
+
+# Named volumes ensure that the container user gets the correct permissions.
+volumes:
+
+  libretranslate_api_keys:
+    driver: local
+    driver_opts:
+      type: none
+      device: $API_KEYS_DIR
+      o: bind
+
+  libretranslate_models:
+    driver: local
+    driver_opts:
+      type: none
+      device: $MODELS_DIR
+      o: bind
+
+services:
+
+  ## Main ##
+  lt-app:
+    container_name: lt-app
+    build:
+      context: ./
+      network: host
+    restart: always
+    ports:
+      - "5000:5000"
+    # Uncomment this for logging in docker compose logs
+    tty: true
+    healthcheck:
+      test: ['CMD-SHELL', './venv/bin/python scripts/healthcheck.py']
+    command: --req-limit $REQUESTS --char-limit $CHARACTERS
+    environment:
+      # Allow the saving of API Keys. Requires volume libretranslate_api_keys.
+      - LT_API_KEYS=true
+      - LT_API_KEYS_DB_PATH=/app/db/api_keys.db
+      # Optimize loading time. Requires volume libretranslate_models.
+      - LT_UPDATE_MODELS=$UPDATE_MODELS
+      - $LANGUAGES
+    volumes:
+      # Store the API keys.
+      - libretranslate_api_keys:/app/db
+      # Avoid re-downloading language models every reboot.
+      - libretranslate_models:/home/libretranslate/.local:rw
+    deploy:
+      mode: global
+      resources:
+        limits:
+          cpus: $CPU
+          memory: $RAM

Config/LibreTranslate/env.example

@@ -0,0 +1,53 @@
+# This file should be renamed '.env' and have any private values modified.
+
+COMPOSE_BAKE=true
+
+### Container Specs ###
+
+## For a small-scale server (such as 1 CPU, 1GB RAM).
+# CPU=0.25
+# RAM=640M
+
+## For a fully capable server.
+CPU=2.00
+RAM=4.0G
+
+# How much the users are able to utilize the server.
+REQUESTS=100
+CHARACTERS=2000
+
+### Languages ###
+
+## Check for language model updates on each run.
+UPDATE_MODELS=true
+
+## Use default behavior of downloading all models.
+# LANGUAGES=ALL
+
+## Otherwise set to a comma-separated list to enable only the desired models.
+LANGUAGES='LT_LOAD_ONLY=en,es,fr,de'
+
+### API Keys ###
+
+API_KEYS=true
+API_KEYS_DB_PATH=/app/db/api_keys.db
+API_KEYS_DIR=../../Volumes/LibreTranslate/api_keys
+
+### Models ###
+
+## Storing models prevents them from needing downloaded each run.
+## Placing them under Volumes means they will increase backup sizes.
+
+MODELS_DIR=../../Volumes/LibreTranslate/models
+
+## Not providing any location puts them in the default Docker /var/ location.
+# MODELS_DIR=
+
+## Storing them in /tmp/ will cause them to get reset after reboots, but hides
+## them from backup type locations such as Volumes/LibreTranslate/ and /var/.
+## Please see the README for the CRON command related to this setting.
+# MODELS_DIR=/tmp/LibreTranslate/models
+
+## Can also place them under /opt/ which may be recommended by FHS standards.
+## This keeps them from taking up precious RAM / swap if using tmpfs or similar.
+# MODELS_DIR=/opt/LibreTranslate/models

Config/LibreTranslate/prep.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# 2025-07-22 Hyperling
+# Create the necessary folders for LibreTranslate's volumes to work.
+# This must be run before the container will start properly.
+
+## Setup ##
+
+DIR="$(dirname -- "${BASH_SOURCE[0]}")"
+source $DIR/.env
+
+## Main ##
+
+# Create folders.
+if [[ $API_KEYS_DIR == "../*" ]]; then
+	API_KEYS_DIR="$DIR/$API_KEYS_DIR"
+fi
+mkdir -pv $API_KEYS_DIR
+
+if [[ $MODELS_DIR == "../*" ]]; then
+	MODELS_DIR="$DIR/$MODELS_DIR"
+fi
+mkdir -pv $MODELS_DIR
+
+# Finish successfully.
+exit 0

Config/Nextcloud/Dockerfile

@@ -0,0 +1,11 @@
+# 2025-06-16 Hyperling
+# Tired of running fixes.sh to install extra packages. Bake them in!
+
+FROM nextcloud:stable
+
+# Cache System Dependencies
+RUN apt-get update && apt-get install -y sudo libmagickcore-7.q16-10-extra htop \
+    iputils-ping dnsutils vim bzip2 libbz2-dev
+
+# Configure PHP Dependency
+RUN docker-php-ext-install bz2

Config/Nextcloud/cron.sh

@@ -4,19 +4,64 @@
 # This should be added to root's crontab with the full path, such as:
 #   */5 * * * * /opt/Docker/Config/Nextcloud/cron.ksh
 
-# Check if a job is already going.
+DIR="$(dirname -- "${BASH_SOURCE[0]}")"
 PROG="$(basename -- "${BASH_SOURCE[0]}")"
+
+# Check if a job is already going.
 RUNNING=`ps -ef | grep $PROG | grep -v grep | grep -v $$ | grep -v "sh -c" | wc -l`
 if (( $RUNNING > 0 )); then
 	exit $RUNNING
 fi
 
-# 2023-08-25 From crontab.
-sh -c "docker exec -u www-data nc-app php cron.php --define apc.enable_cli=1"
+# Usage function for when -h or bad parameters are passed.
+function usage() {
+	cat <<- EOF
+		Script to help with scheduling Nextcloud's cron requirements.
+		Usage: $PROG [-h|-v]
+			-h ) Display the usage and help text.
+				| --help
+			-v) Pass a verbose request to cron.php.
+				| --verbose
+	EOF
+	exit $1
+}
 
-# 2023-08-25 From fixes.sh, keep ownership correct and apps up to date.
-sh -c "docker exec -it nc-app chown -Rc www-data:www-data ."
+# Check for any parameters.
+verbose=""
+case "$1" in
+	"") ;;
+	"-h"|"--help")
+		usage 0
+		;;
+	"-v"|"--verbose")
+		verbose="-v"
+		;;
+	*)
+		echo -e "ERROR: Unknown parameter '$1'. Exiting.\n"
+		usage 1
+		;;
+esac
+
+# Keep ownership correct and apps up to date. Also exists in fixes.sh.
+sh -c "docker exec -i nc-app chown -Rc www-data:www-data ."
 # No longer update apps in advance of NC updates, allow the upgrade process to do it.
 #sh -c "docker exec -itu www-data nc-app ./occ app:update --all"
 
+# Prepare the variables being passed to the execution command.
+if [[ -f $DIR/.env ]]; then
+	source $DIR/.env
+else
+	PHP_MEMORY_LIMIT=256M
+fi
+
+# Main part of what would go in the crontab.
+sh -c "
+	docker exec nc-app \
+	sudo -u www-data \
+	php \
+	-d apc.enable_cli=1 \
+	-d memory_limit=$PHP_MEMORY_LIMIT \
+	-f cron.php $verbose \
+"
+
 exit 0

Config/Nextcloud/docker-compose.micro.yml

@@ -72,7 +72,8 @@ services:
   ## Nextcloud ##
   nc-app:
     container_name: nc-app
-    image: nextcloud:stable
+    build:
+      context: ./
     restart: always
     ports:
       - 8080:80

Config/Nextcloud/docker-compose.standard.yml

@@ -73,7 +73,8 @@ services:
   ## Nextcloud ##
   nc-app:
     container_name: nc-app
-    image: nextcloud:stable
+    build:
+      context: ./
     restart: always
     ports:
       - 8080:80

Config/Nextcloud/env.micro

@@ -1,5 +1,6 @@
-# Example environment file for Nextcloud stack, should be copied as `.env`. The
-#   variables here only apply to the compose file. If you need it passed to a
+# Example environment file for Nextcloud stack, should be copied as `.env`.
+
+# The variables here only apply to the compose file. If you need it passed to a
 #   container then it also needs specified in its `environment:` operator.
 #
 # ** All usernames and passwords need changed before running in production! **
@@ -7,6 +8,17 @@
 # Full guide on the Nextcloud parameters which may be supplied:
 #   https://github.com/docker-library/docs/blob/master/nextcloud/README.md#auto-configuration-via-environment-variables
 
+#
+## Docker ##
+#
+
+# 20250616 - Performance testing was done on an old workstation.
+#   Only Compose: 3.8, 2.5, 1.8, 1.8, 2.1, 2.0, 1.7 seconds
+#   Compose Bake: 3.7, 0.9, 2.3, 2.0, 3.1, 2.1, 1.8 seconds
+# Not really needed but also not harmful and will eliminate the warning.
+# Timings do not include the initial pull for either method.
+COMPOSE_BAKE=true
+
 #
 ## Nextcloud ##
 #

Config/Nextcloud/env.standard

@@ -1,5 +1,6 @@
-# Example environment file for Nextcloud stack, should be copied as `.env`. The
-#   variables here only apply to the compose file. If you need it passed to a
+# Example environment file for Nextcloud stack, should be copied as `.env`.
+
+# The variables here only apply to the compose file. If you need it passed to a
 #   container then it also needs specified in its `environment:` operator.
 #
 # ** All usernames and passwords need changed before running in production! **
@@ -7,6 +8,17 @@
 # Full guide on the Nextcloud parameters which may be supplied:
 #   https://github.com/docker-library/docs/blob/master/nextcloud/README.md#auto-configuration-via-environment-variables
 
+#
+## Docker ##
+#
+
+# 20250616 - Performance testing was done on an old workstation.
+#   Only Compose: 3.8, 2.5, 1.8, 1.8, 2.1, 2.0, 1.7 seconds
+#   Compose Bake: 3.7, 0.9, 2.3, 2.0, 3.1, 2.1, 1.8 seconds
+# Not really needed but also not harmful and will eliminate the warning.
+# Timings do not include the initial pull for either method.
+COMPOSE_BAKE=true
+
 #
 ## Nextcloud ##
 #

Config/Nextcloud/maintenance.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # 2022-09-25 Hyperling
-# Put fixes in a file so they do not need remembered.
+# Put maintenance needs into a file so the commands do not need remembered.
 
 ## Setup ##
 
@@ -11,19 +11,20 @@ source $DIR/../../source.env
 
 ## Main ##
 
-echo -e "\n*** APT ***"
-
-echo -e "\n`date` - Update Apt Cache"
-docker exec -it nc-app apt update -y
-
-echo -e "\n`date` - Install Additional Software"
-docker exec -it nc-app apt install -y sudo libmagickcore-6.q16-6-extra htop \
-	iputils-ping dnsutils vim bzip2 libbz2-dev # php-bz2
-
-# 20240130
-# https://help.nextcloud.com/t/docker-image-setup-warning-missing-bz2-after-update-to-nc-28-0-0/176605
-echo -e "\n`date` - Compile PHP Modules"
-docker exec -it nc-app docker-php-ext-install bz2
+##### 20250616 - Apt and PHP commands now baked into the Dockerfile!! :D #####
+###echo -e "\n*** APT ***"
+###
+###echo -e "\n`date` - Update Apt Cache"
+###docker exec -it nc-app apt update -y
+###
+###echo -e "\n`date` - Install Additional Software"
+###docker exec -it nc-app apt install -y sudo libmagickcore-6.q16-6-extra htop \
+###	iputils-ping dnsutils vim bzip2 libbz2-dev # php-bz2
+###
+#### 20240130
+#### https://help.nextcloud.com/t/docker-image-setup-warning-missing-bz2-after-update-to-nc-28-0-0/176605
+###echo -e "\n`date` - Compile PHP Modules"
+###docker exec -it nc-app docker-php-ext-install bz2
 
 # 2023-12-04 Make sure cron and chmod commands get run.
 echo -e "\n*** CRON ***"
@@ -34,12 +35,27 @@ $DOCKER_HOME/Config/Nextcloud/cron.sh && echo "Success!"
 # 2022-10-30 More additions after moving to Nextcloud version 25.
 echo -e "\n*** DATABASE ***"
 
+echo -e "\n`date` - Enable Maintenance Mode"
+docker exec -itu www-data nc-app ./occ maintenance:mode --on
+
+# 20251004: Disabled since it has not been working.
 # Clear DB errors by allowing the DB to perform any incremental upgrades.
 # https://jira.mariadb.org/browse/MDEV-26342
-echo -e "\n`date` - mysql_upgrade"
-docker exec -itu www-data nc-app ./occ maintenance:mode --on
-time docker exec -it nc-db mysql_upgrade \
-	-user="root" --password="$MYSQL_ROOT_PASSWORD"
+#echo -e "\n`date` - mysql_upgrade"
+#time docker exec -it nc-db mysql_upgrade \
+#	-user="root" --password="$MYSQL_ROOT_PASSWORD"
+
+echo -e "\n`date` - Enable Dynamic Row Formats"
+docker exec -it nc-db mysql -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" \
+    -e "SELECT CONCAT('ALTER TABLE ', TABLE_NAME,' ROW_FORMAT=DYNAMIC; ') FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '$MYSQL_DATABASE' AND ENGINE = 'InnoDB' AND ROW_FORMAT != 'DYNAMIC'; " \
+    -B -N |
+while read -r sql; do
+    echo "SQL being executed: $sql "
+    docker exec nc-db mysql -u "$MYSQL_USER" -p"$MYSQL_PASSWORD" -e "$sql" "$MYSQL_DATABASE";
+    echo " - Done!\ "
+done
+
+echo -e "\n`date` - Disable Maintenance Mode"
 docker exec -itu www-data nc-app ./occ maintenance:mode --off
 
 echo -e "\n`date` - Add Missing Columns"
@@ -69,7 +85,7 @@ docker exec -itu www-data nc-app ./occ files:scan-app-data
 echo -e "\n`date` - Theme Update"
 docker exec -itu www-data nc-app ./occ maintenance:theme:update
 echo -e "\n`date` - Repair"
-docker exec -itu www-data nc-app ./occ maintenance:repair
+docker exec -itu www-data nc-app ./occ maintenance:repair --include-expensive
 
 # May also be useful but do not have much experience with them.
 echo -e "\n`date` - Clean Versions"

Config/ProvisionTests/Dockerfiles/arch

@@ -0,0 +1,12 @@
+# Create a VM for testing Ansible provisioning.
+
+FROM archlinux:base
+
+RUN pacman -Syu --noconfirm && pacman -Sy --noconfirm $PACKAGES $EXTRA_ARCH
+
+COPY bin/main.sh /root/main.sh
+RUN chmod +x /root/main.sh
+
+WORKDIR /root/
+USER root
+CMD ./main.sh

Config/ProvisionTests/Dockerfiles/debian

@@ -0,0 +1,12 @@
+# Create a VM for testing Ansible provisioning.
+
+FROM debian:trixie
+
+RUN apt update && apt dist-upgrade -y && apt install -y $PACKAGES $EXTRA_DEBIAN
+
+COPY bin/main.sh /root/main.sh
+RUN chmod +x /root/main.sh
+
+WORKDIR /root/
+USER root
+CMD ./main.sh

Config/ProvisionTests/Dockerfiles/fedora

@@ -0,0 +1,12 @@
+# Create a VM for testing Ansible provisioning.
+
+FROM fedora:latest
+
+RUN dnf upgrade --refresh -y && dnf install -y $PACKAGES $EXTRA_FEDORA
+
+COPY bin/main.sh /root/main.sh
+RUN chmod +x /root/main.sh
+
+WORKDIR /root/
+USER root
+CMD ./main.sh

Config/ProvisionTests/Dockerfiles/opensuse

@@ -0,0 +1,14 @@
+# Create a VM for testing Ansible provisioning.
+
+FROM opensuse/tumbleweed
+
+RUN zypper -n refresh \
+   && zypper -n dist-upgrade -y \
+   && zypper -n install -y $PACKAGES $EXTRA_OPENSUSE
+
+COPY bin/main.sh /root/main.sh
+RUN chmod +x /root/main.sh
+
+WORKDIR /root/
+USER root
+CMD ./main.sh

Config/ProvisionTests/Dockerfiles/ubuntu

@@ -0,0 +1,12 @@
+# Create a VM for testing Ansible provisioning.
+
+FROM ubuntu:rolling
+
+RUN apt update && apt dist-upgrade -y && apt install -y $PACKAGES $EXTRA_UBUNTU
+
+COPY bin/main.sh /root/main.sh
+RUN chmod +x /root/main.sh
+
+WORKDIR /root/
+USER root
+CMD ./main.sh

Config/ProvisionTests/README.md

@@ -0,0 +1,7 @@
+# Construction Area
+
+This configuration is still a work in progress. :)
+
+# Provision Test Images
+
+Create containers of popular Linux distributions in order to test Ansible.

Config/ProvisionTests/bin/main.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+sh -c "rm -rfv prov-test"
+git clone $REPO --branch=$BRANCH prov-test
+
+cd prov-test
+
+echo "Starting Executable Script"
+
+tail -F /var/mail/mail &
+tail -F /var/mail/ansible &
+
+logfile="/root/test.log"
+$EXEC > $logfile &
+tail -F $logfile
+
+echo "*** Finished $0 @ `date` ***"
+
+wait -n
+
+exit $?

Config/ProvisionTests/docker-compose.standard.yml

@@ -0,0 +1,142 @@
+# Create containers which each execute a provisioning script and exit.
+
+volumes:
+
+  pt-storage:
+    driver: local
+    driver_opts:
+      type: none
+      device: $PT_STORAGE_DIR
+      o: bind
+
+services:
+
+  pt-arch:
+    container_name: pt-arch
+    build:
+      context: ./
+      dockerfile: Dockerfiles/arch
+      network: host
+    restart: no
+    environment:
+      - PACKAGES=$PACKAGES
+      - EXTRA_ARCH=$EXTRA_ARCH
+      - REPO=$REPO
+      - BRANCH=$BRANCH
+      - EXEC=$EXEC
+    volumes:
+      - type: volume
+        source: pt-storage
+        target: /root
+        volume:
+          subpath: arch
+    deploy:
+      mode: global
+      resources:
+        limits:
+          cpus: $CPU
+          memory: $RAM
+
+  pt-debian:
+    container_name: pt-debian
+    build:
+      context: ./
+      dockerfile: Dockerfiles/debian
+      network: host
+    restart: no
+    environment:
+      - PACKAGES=$PACKAGES
+      - EXTRA_DEBIAN=$EXTRA_DEBIAN
+      - REPO=$REPO
+      - BRANCH=$BRANCH
+      - EXEC=$EXEC
+    volumes:
+      - type: volume
+        source: pt-storage
+        target: /root
+        volume:
+          subpath: debian
+    deploy:
+      mode: global
+      resources:
+        limits:
+          cpus: $CPU
+          memory: $RAM
+
+  pt-fedora:
+    container_name: pt-fedora
+    build:
+      context: ./
+      dockerfile: Dockerfiles/fedora
+      network: host
+    restart: no
+    environment:
+      - PACKAGES=$PACKAGES
+      - EXTRA_FEDORA=$EXTRA_FEDORA
+      - REPO=$REPO
+      - BRANCH=$BRANCH
+      - EXEC=$EXEC
+    volumes:
+      - type: volume
+        source: pt-storage
+        target: /root
+        volume:
+          subpath: fedora
+    deploy:
+      mode: global
+      resources:
+        limits:
+          cpus: $CPU
+          memory: $RAM
+
+  pt-opensuse:
+    container_name: pt-opensuse
+    build:
+      context: ./
+      dockerfile: Dockerfiles/opensuse
+      network: host
+    restart: no
+    environment:
+      - PACKAGES=$PACKAGES
+      - EXTRA_OPENSUSE=$EXTRA_OPENSUSE
+      - REPO=$REPO
+      - BRANCH=$BRANCH
+      - EXEC=$EXEC
+    volumes:
+      - type: volume
+        source: pt-storage
+        target: /root
+        volume:
+          subpath: opensuse
+    deploy:
+      mode: global
+      resources:
+        limits:
+          cpus: $CPU
+          memory: $RAM
+
+  pt-ubuntu:
+    container_name: pt-ubuntu
+    build:
+      context: ./
+      dockerfile: Dockerfiles/ubuntu
+      network: host
+    restart: no
+    environment:
+      - PACKAGES=$PACKAGES
+      - EXTRA_UBUNTU=$EXTRA_UBUNTU
+      - REPO=$REPO
+      - BRANCH=$BRANCH
+      - EXEC=$EXEC
+    volumes:
+      - type: volume
+        source: pt-storage
+        target: /root
+        volume:
+          subpath: ubuntu
+    deploy:
+      mode: global
+      resources:
+        limits:
+          cpus: $CPU
+          memory: $RAM

Config/ProvisionTests/env.standard

@@ -0,0 +1,26 @@
+# This file should be renamed '.env' and have any private values modified.
+
+COMPOSE_BAKE=true
+
+## Performance
+CPU=0.2
+RAM=0.2G
+
+## Storage
+#STORAGE_DIR=../../Volumes/ProvisionTests
+PT_STORAGE_DIR=/tmp/ProvisionTests
+
+## Packages
+PACKAGES="git bash curl sudo which"
+EXTRA_ARCH=""
+EXTRA_DEBIAN=""
+EXTRA_FEDORA=""
+EXTRA_OPENSUSE=""
+EXTRA_UBUNTU=""
+
+## Script
+REPO=https://git.hyperling.com/me/env-ansible
+#BRANCH=dev
+BRANCH=stage
+#BRANCH=prod
+EXEC="./setup.sh -l"

Config/ProvisionTests/prep.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# 2025-07-22 Hyperling
+# Create the necessary folders for LibreTranslate's volumes to work.
+# This must be run before the container will start properly.
+
+## Setup ##
+
+DIR="$(dirname -- "${BASH_SOURCE[0]}")"
+source $DIR/.env
+source ../../source.env
+
+## Main ##
+
+# Create folders.
+
+mkdir -pv "$PT_STORAGE_DIR/arch"
+mkdir -pv "$PT_STORAGE_DIR/debian"
+mkdir -pv "$PT_STORAGE_DIR/fedora"
+mkdir -pv "$PT_STORAGE_DIR/opensuse"
+mkdir -pv "$PT_STORAGE_DIR/ubuntu"
+
+# Finish successfully.
+exit 0

Config/WordpressExample/README.md

@@ -0,0 +1,3 @@
+# Construction Area
+
+This configuration is still a work in progress. :)

Config/WordpressExample/docker-compose.main.yml

@@ -0,0 +1,80 @@
+# 2025-10-17 Hyperling
+# Copied and modified from the example here:
+#   https://hub.docker.com/_/wordpress
+# This file should be copied to `docker-compose.yml`.
+# Most configration changes can be done in the env file rather than here.
+
+## TBDs ##
+# - Move env variables to env.example
+# - Look through other environment variables which may be useful.
+# - Add CPU and MEM section
+# - Change ports
+
+# TBD locate these at ../../Volumes and create `prep.sh` script.
+#volumes:
+#  wordpress:
+#  db:
+
+services:
+
+  wp-db:
+    container_name: wp-db
+    image: mariadb:lts
+    restart: always
+    volumes:
+      - ../../Volumes/WordPress/mariadb:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      start_period: 5s
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    environment:
+      # https://mariadb.com/docs/server/server-management/automated-mariadb-deployment-and-administration/docker-and-mariadb/mariadb-server-docker-official-image-environment-variables
+      MARIADB_DATABASE: $MARIADB_DATABASE
+      MARIADB_USER: $MARIADB_USER
+      MARIADB_PASSWORD: MARIADB_PASSWORD
+      MARIADB_ROOT_PASSWORD: $MARIADB_ROOT_PASSWORD
+      MARIADB_AUTO_UPGRADE: $MARIADB_AUTO_UPGRADE
+      WP_CPU_DB: $WP_CPU_DB
+      WP_MEM_DB: $WP_MEM_DB
+    deploy:
+      mode: global
+      resources:
+        limits:
+          cpus: $WP_CPU_DB
+          memory: $WP_MEM_DB
+
+  wp-app:
+    container_name: wp-app
+    image: wordpress:latest
+    restart: always
+    ports:
+      - 8080:80
+    depends_on:
+      wp-db:
+        condition: service_healthy
+    links:
+      - wp-db
+    volumes:
+      - ../../Volumes/WordPress/wordpress:/var/www/html
+    environment:
+      WORDPRESS_ADMIN_USERNAME: $WORDPRESS_ADMIN_USERNAME
+      WORDPRESS_ADMIN_PASSWORD: $WORDPRESS_ADMIN_PASSWORD
+      WORDPRESS_DB_HOST: wp-db
+      WORDPRESS_DB_NAME: $MARIADB_DATABASE
+      # TBD/TODO: Does not work, but recommended. :(
+      #WORDPRESS_DB_USER: $MARIADB_USER
+      #WORDPRESS_DB_PASSWORD: $MARIADB_PASSWORD
+      # Works, but not recommended. Lol.
+      WORDPRESS_DB_USER: root
+      WORDPRESS_DB_PASSWORD: $MARIADB_ROOT_PASSWORD
+      WORDPRESS_DEBUG: $WORDPRESS_DEBUG
+      WP_CPU: $WP_CPU
+      WP_MEM: $WP_MEM
+    deploy:
+      mode: global
+      resources:
+        limits:
+          cpus: $WP_CPU
+          memory: $WP_MEM

Config/WordpressExample/env.main

@@ -0,0 +1,63 @@
+# This file should be copied to `.env` and have its values changes as needed.
+
+## Docker ##
+
+COMPOSE_BAKE=true
+
+## End Docker ##
+
+
+## WordPress ##
+
+# TBD/TODO: These do not actually seem to work.
+WORDPRESS_ADMIN_USERNAME='wp_user'
+WORDPRESS_ADMIN_PASSWORD='wordpress_password'
+
+# Uncomment this to get debug output in the log.
+WORDPRESS_DEBUG=1
+
+## End WordPress ##
+
+
+## Database ##
+
+MARIADB_DATABASE='wordpress'
+
+MARIADB_USER='db_user'
+MARIADB_PASSWORD='database_password'
+
+MARIADB_ROOT_PASSWORD='db_root_password'
+
+# Comment this if you do not want MariaDB to run upgrade scripts on new versions.
+MARIADB_AUTO_UPGRADE=1
+
+## End Database ##
+
+
+## Performance ##
+
+# Standard Minimum
+#WP_CPU=1.00
+#WP_MEM=2.00G
+#WP_CPU_DB=1.00
+#WP_MEM_DB=1.00G
+
+# Standard Recommended
+#WP_CPU=1.00
+#WP_MEM=4.00G
+#WP_CPU_DB=1.00
+#WP_MEM_DB=0.50G
+
+# Tested Minimum
+#WP_CPU=0.35
+#WP_MEM=0.35G
+#WP_CPU_DB=0.15
+#WP_MEM_DB=0.15G
+
+# Tested Recommended
+WP_CPU=0.50
+WP_MEM=0.50G
+WP_CPU_DB=0.25
+WP_MEM_DB=0.25G
+
+## End Performance ##

bin/backup.sh

@@ -9,23 +9,72 @@ source $DIR/../source.env
 
 ## Variables ##
 
-file="/tmp/Backup.zip"
+TAG="Docker"
+DATE="`date "+%Y%m%d-%H%M%S"`"
+BACKUP_DIR="/srv/backup"
+BASENAME="Backup"
+file="$BACKUP_DIR/$BASENAME.$DATE.$HOSTNAME.$TAG.zip"
 time="`which time`"
 
+## Functions ##
+
+function usage {
+	cat <<- EOF
+		Backup script for Hyperling's self-managed Docker setup.
+
+		Usage: $PROG [-u] [-d] [-h]
+			-u : Bring all containers up after the backup has finished.
+			-d : Bring all containers down before taking the backup.
+			-h : Display this help text.
+
+		Example:
+			$PROG -ud
+	EOF
+
+	exit $1
+}
+
+## Parameters ##
+
+up=FALSE
+down=FALSE
+
+while getopts ':udh' opt; do
+	case "$opt" in
+		u) up=TRUE ;;
+		d) down=TRUE ;;
+		h) usage 0 ;;
+		*) echo "ERROR: Option $OPTARG not recognized." >&2
+			usage 1 ;;
+	esac
+done
+
 ## Main ##
 
+# Ensure backup directory exists with correct permissions.
+mkdir -pv "$BACKUP_DIR"
+mkdir -pv "$BACKUP_DIR/TRASH"
+chmod -Rv 775 "$BACKUP_DIR"
+chown -Rv root:root "$BACKUP_DIR"
+
 # Remove the last backup.
-if [[ -e $file ]]; then
-	echo "`date` - Removing existing file."
-	rm -fv $file
+echo "`date` - Removing existing files."
+cd "$BACKUP_DIR"
+mv -v "$BASENAME"*"$TAG"* TRASH/
+rm -v TRASH/*
+
+if [[ "$down" == "TRUE" ]]; then
+	echo -e "\n`date` - Take down services for a cold backup."
+	manage.sh -d
+else
+	echo -e "\n`date` - Skipping take down."
 fi
 
-echo -e "\n`date` - Take down services for a cold backup."
-manage.sh -d
-
 echo -e "\n`date` - Create the backup for '$DOCKER_HOME'."
-cd $DOCKER_HOME
-$time zip -r $file.tmp . 1>/dev/null
+$time zip -r $file.tmp \
+	$DOCKER_HOME \
+	/etc/crontab /etc/cron.d /var/spool/cron \
+	/var/{log,mail} 1>/dev/null
 mv -v $file.tmp $file
 
 echo -e "\n`date` - Done with zipping, check size."
@@ -34,8 +83,12 @@ ls -sh $file
 echo -e "\n`date` - Ensure other users can access the file."
 chmod -v 755 $file
 
-echo -e "\n`date` - Bring services back up."
-manage.sh -u
+if [[ "$up" == "TRUE" ]]; then
+	echo -e "\n`date` - Bring services back up."
+	manage.sh -u
+else
+	echo -e "\n`date` - Skipping restoring services."
+fi
 
 ## Finish ##
 

bin/manage.sh

@@ -130,7 +130,7 @@ fi
 if [[ -z $up && -z $down && -z $build && -z $pull && -z $clean
 	&& -z $interact && -z $logs && -z $stats
 ]]; then
-	docker ps
+	docker ps --size
 	exit 0
 fi