Merge pull request #432 from freedomofpress/406-prod-make-targets

Begins dynamic dev/prod config logic

VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

rpm-build/SPECS/securedrop-workstation-dom0-config.spec

@@ -1,12 +1,12 @@
 Name:		securedrop-workstation-dom0-config
-Version:	0.1.1
+Version:	0.1.2
 Release:	1%{?dist}
 Summary:	SecureDrop Workstation
 
 Group:		Library
 License:	GPLv3+
 URL:		https://github.com/freedomofpress/securedrop-workstation
-Source0:	securedrop-workstation-dom0-config-0.1.1.tar.gz
+Source0:	securedrop-workstation-dom0-config-0.1.2.tar.gz
 
 BuildArch:      noarch
 BuildRequires:	python3-setuptools
@@ -46,12 +46,14 @@ install -m 755 -d %{buildroot}/srv/salt/sd/usb-autoattach
 install -m 644 dom0/*.sls %{buildroot}/srv/salt/
 install -m 644 dom0/*.top %{buildroot}/srv/salt/
 install -m 644 dom0/*.j2 %{buildroot}/srv/salt/
+install -m 644 dom0/*.yml %{buildroot}/srv/salt/
 install -m 644 dom0/securedrop-update %{buildroot}/srv/salt/
 install -m 644 dom0/securedrop-login %{buildroot}/srv/salt/
 install -m 644 dom0/securedrop-launcher.desktop %{buildroot}/srv/salt/
 install -m 655 dom0/securedrop-handle-upgrade %{buildroot}/srv/salt/
 # The next file should get installed via RPM not via salt
 install -m 755 dom0/securedrop-update %{buildroot}/srv/salt/securedrop-update
+install -m 755 scripts/securedrop-admin.py %{buildroot}/%{_bindir}/securedrop-admin
 install -m 644 sd-app/* %{buildroot}/srv/salt/sd/sd-app/
 install -m 644 sd-proxy/* %{buildroot}/srv/salt/sd/sd-proxy/
 install -m 644 sd-whonix/* %{buildroot}/srv/salt/sd/sd-whonix/
@@ -68,6 +70,7 @@ install -m 644 launcher/sdw_updater_gui/*.py %{buildroot}/opt/securedrop/launche
 %{python3_sitelib}/securedrop_workstation_dom0_config*
 %{_datadir}/%{name}
 %{_bindir}/securedrop-update
+%{_bindir}/securedrop-admin
 /srv/salt/sd*
 /srv/salt/dom0-xfce-desktop-file.j2
 /srv/salt/securedrop-*
@@ -81,6 +84,9 @@ find /srv/salt -maxdepth 1 -type f -iname '*.top' \
     | xargs qubesctl top.enable > /dev/null
 
 %changelog
+* Mon Feb 03 2020 Mickael E. <[email protected]> - 0.1.2
+- Provides dev/staging/prod split logic.
+
 * Fri Jan 10 2020 redshiftzero <[email protected]> - 0.1.1
 - First alpha release.