Updates based on review feedback

securedrop-app-code control file is now a template. We don't
need --setuptools in rules file as by default virtualenv will
install the latest setuptools.

Also clean changelog for Focal. We are using single usr.sbin.apache2
for both distribution. Updates the tests var as we rebased against
develop.

install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/defaults/main.yml

@@ -51,11 +51,7 @@ securedrop_python_version: "{{ '3.8' if securedrop_build_focal_support else '3.5
 securedrop_venv_site_packages: "{{ securedrop_venv }}/lib/python{{ securedrop_python_version }}/site-packages"
 
 securedrop_app_focal_files:
-  - src: control-focal
-    dest: "{{ securedrop_app_code_prep_dir }}/debian/control"
   - src: rules-focal
     dest: "{{ securedrop_app_code_prep_dir }}/debian/rules"
   - src: securedrop-app-code.triggers-focal
     dest: "{{ securedrop_app_code_prep_dir }}/debian/securedrop-app-code.triggers"
-  - src: usr.sbin.apache2-focal
-    dest: "{{ securedrop_app_code_prep_dir }}/etc/apparmor.d/usr.sbin.apache2"

install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal

@@ -1,83 +1,5 @@
-securedrop-app-code (1.5.0~rc1+focal) focal; urgency=medium
+securedrop-app-code (1.6.0~rc1+focal) focal; urgency=medium
 
   * 
 
  -- SecureDrop Team <[email protected]>  Thu, 18 Jun 2020 21:58:23 +0000
-
-securedrop-app-code (1.4.0+xenial) xenial; urgency=medium
-
-  * See changelog.md 
-
- -- SecureDrop Team <[email protected]>  Wed, 17 Jun 2020 21:35:57 +0000
-
-securedrop-app-code (1.3.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Tue, 12 May 2020 18:37:42 +0000
-
-securedrop-app-code (1.2.2+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Fri, 13 Mar 2020 19:43:29 +0000
-
-securedrop-app-code (1.2.1+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 19 Feb 2020 14:40:43 +0000
-
-securedrop-app-code (1.2.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 20 Nov 2019 16:48:41 +0000
-
-securedrop-app-code (1.1.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Mon, 21 Oct 2019 18:09:35 +0000
-
-securedrop-app-code (1.0.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Tue, 17 Sep 2019 23:22:22 +0530
-
-securedrop-app-code (0.14.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 10 Jul 2019 15:11:49 +0000
-
-securedrop-app-code (0.13.1+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Tue, 18 Jun 2019 13:48:12 +0000
-
-securedrop-app-code (0.13.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 29 May 2019 20:45:21 +0000
-
-securedrop-app-code (0.12.2+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Thu, 25 Apr 2019 17:54:15 +0000
-
-securedrop-app-code (0.12.1+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 20 Mar 2019 20:20:40 +0000
-
-securedrop-app-code (0.12.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 27 Feb 2019 00:37:02 +0000

install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2

@@ -70,6 +70,7 @@
   /etc/magic r,
   /etc/mime.types r,
   /etc/python3.5/sitecustomize.py r,
+  /etc/python3.8/sitecustomize.py r,
   /etc/services r,
   /etc/timezone r,
   /lib/x86_64-linux-gnu/libbz2.so.* mr,
@@ -87,6 +88,7 @@
   /run/apache2/wsgi.*.sock rw,
   /run/lock/apache2/rewrite-map.* rw,
   /run/lock/apache2/ssl-cache.* rwk,
+  /run/systemd/userdb/io.systemd.DynamicUser r,
   /run/shm rw,
   /sbin/ldconfig rix,
   /sbin/ldconfig.real rix,
@@ -107,6 +109,9 @@
   /opt/venvs/securedrop-app-code/bin/python3 r,
   /opt/venvs/securedrop-app-code/lib/python3.5/ r,
   /opt/venvs/securedrop-app-code/lib/python3.5/** rm,
+  /opt/venvs/securedrop-app-code/lib/python3.8/ r,
+  /opt/venvs/securedrop-app-code/lib/python3.8/** rm,
+  /opt/venvs/securedrop-app-code/pyvenv.cfg r,
   /var/lib/securedrop/ r,
   /var/lib/securedrop/db.sqlite kw,
   /var/lib/securedrop/db.sqlite rwk,
@@ -280,6 +285,8 @@
   /var/www/securedrop/static/i/logo-footer.png r,
   /var/www/securedrop/static/i/no16-global.png r,
   /var/www/securedrop/static/i/no16.png r,
+  /var/www/securedrop/static/i/securedrop.png r,
+  /var/www/securedrop/static/i/securedrop_small.png r,
   /var/www/securedrop/static/i/server_upload.png r,
   /var/www/securedrop/static/i/star.png r,
   /var/www/securedrop/static/i/success_checkmark.png r,