mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-12-16 05:43:22 +00:00
Refactor run-once orchestration and bootstrap Mailu/Mastodon in a single deploy
- Replace legacy utils/run_once.yml with the new helpers utils/once_flag.yml and utils/once_finalize.yml - Introduce utils/compose_up.yml to ensure docker-compose stacks are up and to flush handlers safely without coupling to run-once flags - Migrate all affected roles (desk-*, dev-*, sys-ctl-*, sys-svc-*, web-app-*, web-svc-*, util-*) to the new run-once helpers - Rework sys-svc-msmtp to auto-load Mailu once per deploy, check reachability, and reuse the running stack instead of requiring multiple playbook passes - Adjust web-app-mailu to integrate cert deployment, handler flushing, and run-once handling so Mailu is fully initialized in a single deploy - Improve Matomo, CDN, logout and CSP/health-check related roles to cooperate with the new compose_up / once_* pattern - Simplify alarm/backup/timer/service orchestration (sys-ctl-alm-*, sys-bkp-provider, sys-timer-cln-bkps, etc.) by moving run-once logic into dedicated 01_core.yml files - Update integration tests so utils/once_flag.yml and utils/once_finalize.yml are recognised as valid run-once providers, keeping the global run_once_* guarantees consistent - Align frontend injection and service dependencies so Mastodon- and Mailu-related services can be brought up coherently within a single deployment cycle rather than several iterations
This commit is contained in:
@@ -10,45 +10,71 @@ fi
|
||||
ssl_cert_folder="$1"
|
||||
docker_compose_instance_directory="$2"
|
||||
letsencrypt_live_path="$3"
|
||||
docker_compose_cert_directory="$docker_compose_instance_directory/volumes/certs"
|
||||
docker_compose_cert_directory="${docker_compose_instance_directory}volumes/certs"
|
||||
|
||||
# Copy certificates
|
||||
cp -RvL "$letsencrypt_live_path/$ssl_cert_folder/"* "$docker_compose_cert_directory" || exit 1
|
||||
# Ensure the target cert directory exists
|
||||
if [ ! -d "$docker_compose_cert_directory" ]; then
|
||||
echo "Creating certs directory: $docker_compose_cert_directory"
|
||||
mkdir -p "$docker_compose_cert_directory" || exit 1
|
||||
fi
|
||||
|
||||
# This code is optimized for mailu
|
||||
cp -v "$letsencrypt_live_path/$ssl_cert_folder/privkey.pem" "$docker_compose_cert_directory/key.pem" || exit 1
|
||||
cp -v "$letsencrypt_live_path/$ssl_cert_folder/fullchain.pem" "$docker_compose_cert_directory/cert.pem" || exit 1
|
||||
# Copy all certificates (generic)
|
||||
cp -RvL "${letsencrypt_live_path}/${ssl_cert_folder}/"* "$docker_compose_cert_directory" || exit 1
|
||||
|
||||
# Mailu optimization: explicit key/cert mapping
|
||||
cp -v "${letsencrypt_live_path}/${ssl_cert_folder}/privkey.pem" "${docker_compose_cert_directory}/key.pem" || exit 1
|
||||
cp -v "${letsencrypt_live_path}/${ssl_cert_folder}/fullchain.pem" "${docker_compose_cert_directory}/cert.pem" || exit 1
|
||||
|
||||
# Set correct reading rights
|
||||
chmod a+r -v "$docker_compose_cert_directory/"*
|
||||
chmod a+r -v "${docker_compose_cert_directory}/"* || exit 1
|
||||
|
||||
# Flag to track if any Nginx reload was successful
|
||||
# Flags to track Nginx reload status
|
||||
nginx_reload_successful=false
|
||||
nginx_reload_failed=false
|
||||
failed_services=""
|
||||
|
||||
# Reload Nginx in all containers within the Docker Compose setup
|
||||
cd "$docker_compose_instance_directory" || exit 1
|
||||
|
||||
echo "Wait for 5 minutes to prevent interuption of setup procedures"
|
||||
sleep 300
|
||||
|
||||
# Iterate over all services
|
||||
for service in $(docker compose ps --services); do
|
||||
echo "Checking service: $service"
|
||||
|
||||
# Check if Nginx exists in the container
|
||||
if docker compose exec -T "$service" which nginx > /dev/null 2>&1; then
|
||||
echo "Testing Nginx config for service: $service"
|
||||
if ! docker compose exec -T "$service" nginx -t; then
|
||||
echo "Nginx config test FAILED for service: $service" >&2
|
||||
nginx_reload_failed=true
|
||||
failed_services="$failed_services $service"
|
||||
continue
|
||||
fi
|
||||
|
||||
echo "Reloading Nginx for service: $service"
|
||||
if docker compose exec -T "$service" nginx -s reload; then
|
||||
nginx_reload_successful=true
|
||||
echo "Successfully reloaded Nginx for service: $service"
|
||||
else
|
||||
echo "Failed to reload Nginx for service: $service" >&2
|
||||
nginx_reload_failed=true
|
||||
failed_services="$failed_services $service"
|
||||
fi
|
||||
else
|
||||
echo "Nginx not found in service: $service, skipping."
|
||||
fi
|
||||
done
|
||||
|
||||
# Restart all containers if no Nginx reload was successful
|
||||
if [ "$nginx_reload_successful" = false ]; then
|
||||
echo "No Nginx reload was successful. Restarting all Docker containers."
|
||||
docker compose restart || exit 1
|
||||
else
|
||||
# Optional auto-healing: restart only the services whose reload failed
|
||||
if [ "$nginx_reload_failed" = true ]; then
|
||||
echo "At least one Nginx reload failed. Affected services:${failed_services}"
|
||||
echo "Restarting affected services to apply the new certificates..."
|
||||
# shellcheck disable=SC2086
|
||||
(sleep 120 && docker compose restart $failed_services) || (sleep 120 && docker compose restart) || exit 1
|
||||
elif [ "$nginx_reload_successful" = true ]; then
|
||||
echo "At least one Nginx reload was successful. No restart needed."
|
||||
else
|
||||
echo "No Nginx instances found in any service. Nothing to reload."
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user