Skip to content

Build securedrop-admin-dom0-config package #1554

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

Draft
zenmonkeykstop wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Build securedrop-admin-dom0-config package #1554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
include securedrop_salt/*
include admin_salt/*
include README.md
include LICENSE
include VERSION
Expand Down
1 change: 1 addition & 0 deletions admin_salt/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Placeholder
16 changes: 15 additions & 1 deletion rpm-build/SPECS/securedrop-workstation-dom0-config.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ SecureDrop Workstation project. The package should be installed
in dom0, or AdminVM, context, in order to manage updates to the VM
configuration over time.

%package -n securedrop-admin-dom0-config
Summary: SecureDrop Admin
%description -n securedrop-admin-dom0-config
This package contains VM configuration files for the Qubes-based
SecureDrop Admin project. The package should be installed
in dom0, or AdminVM, context, in order to manage updates to the VM
configuration over time.

%prep
%setup -q -n %{name}-%{version}
Expand All @@ -60,7 +67,7 @@ configuration over time.
%build
# No building necessary here, but this soothes rpmlint


# single install directive for files for all packages
%install
%{python3} -m pip install --no-compile --no-index --no-build-isolation --root %{buildroot} .
# direct_url.json is is not reproducible and not strictly needed
Expand All @@ -70,6 +77,9 @@ sed -i "/\.dist-info\/direct_url\.json,/d" %{buildroot}/%{python3_sitelib}/*%{ve
install -m 755 -d %{buildroot}/srv/salt/
cp -a securedrop_salt %{buildroot}/srv/salt/

# test admin directory install
cp -a admin_salt %{buildroot}/srv/salt/admin_salt

install -m 755 -d %{buildroot}/%{_datadir}/%{name}/scripts
install -m 755 -d %{buildroot}/%{_bindir}
install -m 755 -d %{buildroot}/opt/securedrop
Expand Down Expand Up @@ -153,6 +163,10 @@ install -m 644 files/securedrop-user-xfce-icon-size.service %{buildroot}/%{_user
%doc README.md
%license LICENSE

%files -n securedrop-admin-dom0-config
/srv/salt/admin_salt/*
%license LICENSE

%post
# Update Salt Configuration
qubesctl saltutil.clear_cache -l quiet --out quiet > /dev/null || true
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-rpm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ rpmbuild \
python3 scripts/verify_rpm_mtime.py

printf '\nBuild complete! RPMs and their checksums are:\n\n'
find rpm-build/ -type f -iname "${PROJECT}-$(cat "${TOPLEVEL}/VERSION")*.rpm" -print0 | sort -zV | xargs -0 sha256sum
find rpm-build/ -type f -iname "securedrop-*-$(cat "${TOPLEVEL}/VERSION")*.rpm" -print0 | sort -zV | xargs -0 sha256sum