Merge pull request #6544 from freedomofpress/hmmmmmm

Reorganize Debian packaging, have debhelper do most of the work

Makefile

@@ -64,7 +64,7 @@ update-pip-requirements: update-admin-pip-requirements update-python3-requiremen
 .PHONY: check-black
 check-black: ## Check Python source code formatting with black
 	@echo "███ Running black check..."
-	@black --check --diff setup.py securedrop \
+	@black --check --diff securedrop \
                 install_files \
                 journalist_gui \
                 molecule \
@@ -73,7 +73,7 @@ check-black: ## Check Python source code formatting with black
 
 .PHONY: black
 black: ## Update Python source code formatting with black
-	@black setup.py securedrop \
+	@black securedrop \
                 install_files \
                 journalist_gui \
                 molecule \
@@ -82,7 +82,7 @@ black: ## Update Python source code formatting with black
 .PHONY: check-isort
 check-isort: ## Check Python import organization with isort
 	@echo "███ Running isort check..."
-	@isort --check-only --diff setup.py securedrop \
+	@isort --check-only --diff securedrop \
                 install_files \
                 journalist_gui \
                 molecule \
@@ -91,7 +91,7 @@ check-isort: ## Check Python import organization with isort
 
 .PHONY: isort
 isort: ## Update Python import organization with isort
-	@isort setup.py securedrop \
+	@isort securedrop \
                 install_files \
                 journalist_gui \
                 molecule \

install_files/ansible-base/group_vars/all/securedrop

@@ -18,13 +18,6 @@ remote_host_ref: "{{ ansible_host|default(inventory_hostname) }}"
 # is used on the build VM to pull in required packages.
 development_dependencies: []
 
-# These profiles are referenced by multiple machines, such as Application Server
-# for direct copying at install time, and the build machine for including them
-# in the deb packages.
-apparmor_profiles:
-  - usr.sbin.tor
-  - usr.sbin.apache2
-
 # Installing the securedrop-app-code.deb package
 securedrop_target_distribution: focal
 securedrop_app_code_deb: "securedrop-app-code_{{ securedrop_version }}+{{ securedrop_target_distribution }}_amd64" # do not enter .deb extension

install_files/ansible-base/group_vars/securedrop_application_server.yml

@@ -6,9 +6,9 @@ ip_info:
 
 ### Used by the install_local_deb_pkgs role ###
 local_deb_packages:
-  - "securedrop-keyring-0.1.6+{{ securedrop_version }}+{{ securedrop_target_distribution }}-amd64.deb"
-  - "securedrop-config-0.1.4+{{ securedrop_version }}+{{ securedrop_target_distribution }}-amd64.deb"
-  - "securedrop-ossec-agent-3.6.0+{{ securedrop_version }}+{{ securedrop_target_distribution }}-amd64.deb"
+  - "securedrop-keyring_0.1.6+{{ securedrop_version }}+{{ securedrop_target_distribution }}_all.deb"
+  - "securedrop-config_{{ securedrop_version }}+{{ securedrop_target_distribution }}_all.deb"
+  - "securedrop-ossec-agent_3.6.0+{{ securedrop_version }}+{{ securedrop_target_distribution }}_all.deb"
   - "securedrop-grsec-{{ grsec_version }}+{{ securedrop_target_distribution }}-amd64.deb"
   - "{{ securedrop_app_code_deb }}.deb"
   - "ossec-agent-3.6.0+{{ securedrop_target_distribution }}-amd64.deb"

install_files/ansible-base/group_vars/securedrop_monitor_server.yml

@@ -6,9 +6,9 @@ ip_info:
 
 ### Used by the install_local_deb_pkgs role ###
 local_deb_packages:
-  - "securedrop-keyring-0.1.6+{{ securedrop_version }}+{{ securedrop_target_distribution }}-amd64.deb"
-  - "securedrop-config-0.1.4+{{ securedrop_version }}+{{ securedrop_target_distribution }}-amd64.deb"
-  - "securedrop-ossec-server-3.6.0+{{ securedrop_version }}+{{ securedrop_target_distribution }}-amd64.deb"
+  - "securedrop-keyring_0.1.6+{{ securedrop_version }}+{{ securedrop_target_distribution }}_all.deb"
+  - "securedrop-config_{{ securedrop_version }}+{{ securedrop_target_distribution }}_all.deb"
+  - "securedrop-ossec-server_3.6.0+{{ securedrop_version }}+{{ securedrop_target_distribution }}_all.deb"
   - securedrop-grsec-{{ grsec_version }}+{{ securedrop_target_distribution }}-amd64.deb
   - ossec-server-3.6.0+{{ securedrop_target_distribution }}-amd64.deb
 

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

@@ -2,34 +2,24 @@
 # Directory for creating the sdist tarball
 securedrop_app_code_prep_dir: "/tmp/{{ securedrop_app_code_deb }}-prep"
 
-# Directory for storing the filtered application code files. These files
-# are "filtered" via an `.rsync-filter` file in the src directory.
-securedrop_code_filtered: "{{ securedrop_app_code_prep_dir }}/var/www/securedrop"
-
-securedrop_translation_pip_requirements: "{{ securedrop_code_filtered }}/requirements/python3/translation-requirements.txt"
-securedrop_pip_requirements: "{{ securedrop_code_filtered }}/requirements/python3/securedrop-app-code-requirements.txt"
-
 # SecureDrop code installation directory
 securedrop_code: /var/www/securedrop
 
 # Location of the application storage on disk, including database.
 securedrop_data: /var/lib/securedrop
 
-# Configuration files for SecureDrop systemd services
-systemd_services:
-  - securedrop_rqrequeue.service
-  - securedrop_rqworker.service
-  - securedrop_shredder.service
-  - securedrop_source_deleter.service
-
 # SecureDrop rq worker log directory
 securedrop_worker_log_dir: /var/log/securedrop_worker
 
 # SecureDrop user
 securedrop_user: "www-data"
 
 # Directory for building the Debian package
-securedrop_app_code_deb_dir: "/tmp/{{ securedrop_app_code_deb }}"
+securedrop_app_code_deb_dir: "/tmp/securedrop-build"
+
+securedrop_translation_pip_requirements: "{{ securedrop_app_code_deb_dir }}/requirements/python3/translation-requirements.txt"
+securedrop_pip_requirements: "{{ securedrop_app_code_deb_dir }}/requirements/python3/securedrop-app-code-requirements.txt"
+
 
 securedrop_app_rsync_opts:
   - "--chmod=u=rwX,g=rX,o=rX"