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

Remove (sys/sd)-whonix default prompt #2278

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Package: securedrop-whonix-config
Section: admin
Architecture: all
# FIXME: s/tor/anon-gw-anonymizer-config/ (requires Whonix repositories in piuparts)
Depends: ${misc:Depends}, securedrop-qubesdb-tools, tor
Depends: ${misc:Depends}, securedrop-qubesdb-tools, tor, systemcheck
Copy link
Member

Choose a reason for hiding this comment

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

This is correct, but this is what's causing the piuparts jobs to fail (see the TODO). Let me work on that for you.

Description: Whonix configuration for SecureDrop.
This package configures Whonix/Tor for SecureDrop.

Expand Down
1 change: 1 addition & 0 deletions debian/securedrop-whonix-config.install
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
whonix-config/app_journalist.auth_private.tmpl /usr/share/securedrop-whonix-config
whonix-config/etc/systemcheck.d/50_securedrop.conf /etc/systemcheck.d/
Copy link
Member

Choose a reason for hiding this comment

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

Since we're shipping a file in /etc/, we need to adapt the conffiles hack (see debian/rules) for the securedrop-whonix-config package as well.

11 changes: 11 additions & 0 deletions whonix-config/etc/systemcheck.d/50_securedrop.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## SKIP NON-ACTIONABLE MESSAGES
# Reducing messages that make automated tests more difficult.

# Skip info about enabled derivative repository
systemcheck_skip_functions+=" check_apt_repository"

# Skip OS updates check (already ensured in SD updater)
systemcheck_skip_functions+=" check_operating_system"

# Skip donate message
systemcheck_skip_functions+=" donate"
Loading