diff --git a/MANIFEST.in b/MANIFEST.in index 1258cd98..5a448523 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,5 @@ include securedrop_salt/* +include admin_salt/* include README.md include LICENSE include VERSION diff --git a/admin_salt/README b/admin_salt/README new file mode 100644 index 00000000..3b94f915 --- /dev/null +++ b/admin_salt/README @@ -0,0 +1 @@ +Placeholder diff --git a/rpm-build/SPECS/securedrop-workstation-dom0-config.spec b/rpm-build/SPECS/securedrop-workstation-dom0-config.spec index 666cef1e..bf76be09 100644 --- a/rpm-build/SPECS/securedrop-workstation-dom0-config.spec +++ b/rpm-build/SPECS/securedrop-workstation-dom0-config.spec @@ -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} @@ -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 @@ -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 @@ -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 diff --git a/scripts/build-rpm.sh b/scripts/build-rpm.sh index 170444ad..9632e59e 100755 --- a/scripts/build-rpm.sh +++ b/scripts/build-rpm.sh @@ -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