diff --git a/root/etc/s6-overlay/s6-rc.d/init-outdated-config/run b/root/etc/s6-overlay/s6-rc.d/init-outdated-config/run index 42f3ad1..0bfe88b 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-outdated-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-outdated-config/run @@ -11,3 +11,9 @@ if [[ -f /config/nginx/ldap.conf ]]; then Ensure your configs are updated and remove /config/nginx/ldap.conf If you do not use this config, simply remove it." fi +if grep -qrle ' /etc/letsencrypt' /config/nginx; then + echo " The following nginx confs are using certificates from the obsolete location + /etc/letsencrypt and should be updated to point to /config/etc/letsencrypt + " + echo -n " " && grep -rle ' /etc/letsencrypt' /config/nginx +fi diff --git a/root/migrations/02-swag-old-certbot-paths b/root/migrations/02-swag-old-certbot-paths index 20a2a1b..669533c 100755 --- a/root/migrations/02-swag-old-certbot-paths +++ b/root/migrations/02-swag-old-certbot-paths @@ -1,7 +1,7 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -# Migrate existing confs with old paths from /etc/letsencrypt to /config/etc/letsencrypt -if [[ ! -f "/config/etc/letsencrypt/02-swag-old-certbot-paths" ]] && ls /config/etc/letsencrypt/renewal/*.conf >/dev/null 2>&1; then - sed -i 's| /etc/letsencrypt| /config/etc/letsencrypt|' /config/etc/letsencrypt/renewal/*.conf && touch /config/etc/letsencrypt/02-swag-old-certbot-paths +# Migrate existing renewal confs with old paths from /etc/letsencrypt to /config/etc/letsencrypt +if ls /config/etc/letsencrypt/renewal/*.conf >/dev/null 2>&1; then + sed -i 's| /etc/letsencrypt| /config/etc/letsencrypt|' /config/etc/letsencrypt/renewal/*.conf fi