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.

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

Import okay #4151

Merged
merged 2 commits into from
Feb 18, 2019
Merged

Import okay #4151

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
261468a
securedrop-app-code postinst: migrate keyring
redshiftzero Feb 6, 2019
71ac0eb
Fixes #4108 no import_ok error for importing gpg
kushaldas Feb 18, 2019
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
6 changes: 6 additions & 0 deletions install_files/securedrop-app-code/debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ case "$1" in
echo allow-loopback-pinentry > /var/lib/securedrop/keys/gpg-agent.conf
fi

# Migrate private keyring to gpg2.1 if needed
if [ ! -d "/var/lib/securedrop/keys/private-keys-v1.d" ]; then
# Then we should migrate the keyring
gpg2 --homedir=/var/lib/securedrop/keys --batch --import < /var/lib/securedrop/keys/secring.gpg
fi

chown -R www-data:www-data /var/lib/securedrop /var/www/securedrop

pip install --no-index --find-links=/var/securedrop/wheelhouse --upgrade \
Expand Down