Skip to content
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

Correct backup location of custom logo #5880

Merged
merged 1 commit into from
Mar 31, 2021
Merged

Conversation

eloquence
Copy link
Member

@eloquence eloquence commented Mar 25, 2021

Status

Ready for review

Description of Changes

Testing

  1. Check out this branch on a real or virtualized (but preferably non-imaginary) Admin Workstation
  2. Configure a custom logo on your server
  3. Run ./securedrop-admin --force backup from ~/Persistent/securedrop
    • Observe no errors in output and that resultant tarball contains custom_logo.png (under /var/www)
  4. Remove/rename custom logo (/var/www/securedrop/static/i/custom_logo.png on app)
  5. Repeat step 3
    • Observe no errors in output and that resultant tarball does not contain a logo file

Deployment

No special considerations; instructions added via freedomofpress/securedrop-docs#181 can be removed once this is included in a release.

Checklist

Copy link
Contributor

@zenmonkeykstop zenmonkeykstop left a comment

Choose a reason for hiding this comment

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

Ran through test plan, worked as expected. Also restored with:

  • an old backup with logo.png but not custom-logo.png - the custom logo on the server stayed active ✔️
  • a new backup with custom_logo.png after removing it server-side - the custom logo was updated from the backup ✔️

LGTM

@zenmonkeykstop zenmonkeykstop merged commit 84dfbfd into develop Mar 31, 2021
@zenmonkeykstop zenmonkeykstop deleted the 5868-save-the-logos branch March 31, 2021 18:21
@kushaldas kushaldas mentioned this pull request Apr 12, 2021
23 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Backup script does not include custom logo
2 participants