Merge pull request #5 from freedomofpress/add-securedrop-workstation-…

…config Add securedrop-workstation-config package to template
freedomofpress · Oct 17, 2018 · f2f4576 · f2f4576
2 parents 78b8bd5 + 313a1c1
commit f2f4576
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/securedrop-workstation.conf b/securedrop-workstation.conf
@@ -7,10 +7,11 @@
 # Assigments can be made with VAR_NAME="VALUE"
 
 GIT_URL_template_securedrop_workstation = https://github.com/freedomofpress/qubes-template-securedrop-workstation
+
 BRANCH_template_securedrop_workstation ?= master
 BUILDER_PLUGINS += builder-debian
 BUILDER_PLUGINS += template-securedrop-workstation
-
+USE_QUBES_REPO_VERSION = 4.0
 # TEMPLATE_ONLY - Only build templates
 # Set 1 to only build template or clear the value for a full build
 # Default: novalue

diff --git a/securedrop-workstation/04_install_qubes_post.sh b/securedrop-workstation/04_install_qubes_post.sh
@@ -52,7 +52,7 @@ echo "$workstation_repository_apt_line" > "${INSTALLDIR}/$workstation_repository
 
 aptUpdate
 
-aptInstall securedrop-workstation-grsec
+aptInstall securedrop-workstation-grsec securedrop-workstation-config
 
 # Needed for qubes tooling (qubes-open-in-vm and qubes-copy-to-vm)
 # If more pax flags are needed in the future, we should manage them through a config file