From 9a0383bc730b85e365e737deef8a8e2bed981cec Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Wed, 9 Jul 2025 16:30:45 +1000 Subject: [PATCH] Move SKIP_CERTBOT_OWNERSHIP check around the entire certbot code --- .../rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh index 1ec117e1..05cbddea 100755 --- a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh @@ -26,12 +26,10 @@ chown -R "$PUID:$PGID" /etc/nginx/conf.d # Certbot directories - optimized approach CERT_INIT_FLAG="/opt/certbot/.ownership_initialized" -if [ ! -f "$CERT_INIT_FLAG" ]; then +if [ ! -f "$CERT_INIT_FLAG" ] || [ "$SKIP_CERTBOT_OWNERSHIP" != "true" ]; then # Prevents errors when installing python certbot plugins when non-root - if [ "$SKIP_CERTBOT_OWNERSHIP" != "true" ]; then - log_info 'Changing ownership of /opt/certbot directories ...' - chown "$PUID:$PGID" /opt/certbot /opt/certbot/bin - fi + log_info 'Changing ownership of /opt/certbot directories ...' + chown "$PUID:$PGID" /opt/certbot /opt/certbot/bin # Handle all site-packages directories efficiently find /opt/certbot/lib -type d -name "site-packages" | while read -r SITE_PACKAGES_DIR; do