Removes aa-complain logic from Ansible

The aa-complain logic paths were off by default, and are left over from the days when we did not enforce AppArmor on staging VMs. We've since switched to enforcing AppArmor profiles by default in staging, to catch problems earlier in the development and testing cycle.
freedomofpress · Feb 22, 2019 · 1a04ad8 · 1a04ad8
1 parent 5585979
commit 1a04ad8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 59 deletions.
diff --git a/install_files/ansible-base/roles/app-test/defaults/main.yml b/install_files/ansible-base/roles/app-test/defaults/main.yml
@@ -1,9 +1,4 @@
 ---
-# Whether to set the Apache AppArmor profiles to "complain".
-# Can aid in debugging the AppArmor profiles, but also permits
-# misconfigurations, and so should be used with caution.
-securedrop_app_test_apparmor_complain: False
-
 # Username for Apache service, used to set permissions on the
 # Source Interface config to enable logging in the staging environment.
 apache_user: www-data

diff --git a/install_files/ansible-base/roles/app-test/tasks/apparmor_complain.yml b/install_files/ansible-base/roles/app-test/tasks/apparmor_complain.yml
diff --git a/install_files/ansible-base/roles/app-test/tasks/main.yml b/install_files/ansible-base/roles/app-test/tasks/main.yml
@@ -4,11 +4,6 @@
   tags:
     - apache
 
-- include: apparmor_complain.yml
-  when: securedrop_app_test_apparmor_complain
-  tags:
-    - aa-complain
-
 - include: dev_setup_xvfb_for_functional_tests.yml
 
 - include: setup_firefox_for_selenium.yml