diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 6877b3f..e109da4 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -92,10 +92,14 @@ jobs: if [ ! -f "$NGINX_SCRIPT" ]; then NGINX_SCRIPT="/var/www/ladill.com/current/deployment/setup-service-subdomain-nginx.sh" fi - if [ -f "$NGINX_SCRIPT" ]; then - sudo bash "$NGINX_SCRIPT" events --app /var/www/ladill-events/current - else + if [ ! -f "$NGINX_SCRIPT" ]; then echo "WARN: setup-service-subdomain-nginx.sh not found — configure events.ladill.com vhost manually" + exit 0 + fi + if sudo -n bash "$NGINX_SCRIPT" events --app /var/www/ladill-events/current; then + echo "nginx vhost updated for events.ladill.com" + else + echo "WARN: nginx vhost step skipped (deploy user cannot sudo) — vhost must already be provisioned" fi - name: Cleanup diff --git a/deploy/deploy.sh b/deploy/deploy.sh index 02fa494..4aca844 100755 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -205,7 +205,13 @@ switch_current_release() { } log "Switching current release" -switch_current_release +if ! switch_current_release; then + echo "Failed to point $CURRENT_LINK at $NEW_RELEASE" >&2 + exit 1 +fi + +LIVE_REV="$(cat "$CURRENT_LINK/REVISION" 2>/dev/null || echo unknown)" +log "Live release: $STAMP (revision $LIVE_REV)" log "Optimizing Laravel" if [ -L "$CURRENT_LINK" ] && [ -f "$CURRENT_LINK/artisan" ]; then diff --git a/public/favicon.ico b/public/favicon.ico index f042969..c438fd0 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/resources/views/events/signed-out.blade.php b/resources/views/events/signed-out.blade.php index c558742..b73841b 100644 --- a/resources/views/events/signed-out.blade.php +++ b/resources/views/events/signed-out.blade.php @@ -4,6 +4,7 @@