-
Notifications
You must be signed in to change notification settings - Fork 687
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.
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
Do not declare logo as conffile #6101
Conversation
bc3df94
to
7effd06
Compare
Per comments on #5850 I've added a migration function for old logos to The catch is this: When I look at stock logos in the wild, I am encountering different checksums. For example, Options that I see:
Honestly, I am leaning towards the first option, there are diminishing returns in trying to handle this migration gracefully, and it'd be nice to get rid of this bit of technical debt to avoid future issues. But please let me know if I'm missing something, obvious or not! |
Clobbering the logos of instances with admins that may not be responsive to comms seems like something to avoid, even if there's only a few of them. We're unlikely to update the stock logo anyway so I'd argue for option 2 - also, if folks already have updated the stock file it makes sense to me to copy that to |
f80a906
to
8e4efc7
Compare
OK, it's not clobberin' time. Have simplified the I tested the previous |
8e4efc7
to
597ba4e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested using the upgrade scenario documented in https://docs.securedrop.org/en/latest/development/upgrade_testing.html Confirmed that a custom logo was not overridden after upgrade. During upgrade, the checksum changed for /var/www/securedrop/static/i/logo.png
, but not for /var/www/securedrop/static/i/custom_logo.png
, as expected.
Resolves #5850
Status
Ready for review.
(
conffiles
needs to be preserved as a zero-byte file to squash the autogenerated one.)Testing
make build-debs
from this branchDeployment considerations
This change will clobber custom logos on very long-running installations that were upgraded during a specific time window; see #5850 (comment) . Only a very small number of installations are likely to be impacted, which we can resolve with direct notices.