Skip to content

Update init-outdated-config/run #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nitschis wants to merge 2 commits into from
Closed

Update init-outdated-config/run #555

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffe9668
Update init-outdated-config/run
nitschis Mar 28, 2025
ef3c569
Merge branch 'master' into patch-1
nitschis Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions root/etc/s6-overlay/s6-rc.d/init-outdated-config/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +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
if grep -qr '/etc/letsencrypt' --include="*.conf" /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
echo -n " " && grep -r '/etc/letsencrypt' --include="*.conf" /config/nginx | grep >
Copy link
Copy Markdown
Member

@thespad thespad Apr 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing e achieves nothing, it's the pattern signifier. Removing l means it prints output for every reference in every file, instead of just printing each matching file once.

Piping the output to grep > is just going to error because you're trying to redirect output to a newline.

I'm unclear both what the original issue is, and how these changes are supposed to fix it.

Copy link
Copy Markdown
Member

@nemchik nemchik Apr 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More importantly, changing the pattern being matched from ' /etc/letsencrypt' to '/etc/letsencrypt' (removing the leading space inside the quotes) would actually create a new issue because this new grep command will match configs that contain /config/etc/letsencrypt

As a side note, I don't recall any nginx conf we shipped that used '/etc/letsencrypt' or '/config/etc/letsencrypt'. There are however certbot configs used for renewal that should match the glob /config/etc/letsencrypt/renewal/*.conf that look to be handled in https://github.com/linuxserver/docker-swag/blob/master/root/migrations/02-swag-old-certbot-paths

Copy link
Copy Markdown
Member

@thespad thespad Apr 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We didn't ship any, but a bunch of people had created their own confs and included the cert paths, which is why the check/log warning was added.

fi