Merge pull request #5404 from freedomofpress/remove-unused-onion-serv…

…ice-url-files Remove unused/disabled source onion service info files
freedomofpress · Jul 23, 2020 · 29efec0 · 29efec0
2 parents d2c5bef + 492db2d
commit 29efec0
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/install_files/ansible-base/roles/app/tasks/copy_tor_url_info_to_app_dir.yml b/install_files/ansible-base/roles/app/tasks/copy_tor_url_info_to_app_dir.yml
@@ -15,7 +15,7 @@
   failed_when: false
   when: v3_onion_services
 
-- name: Expose Tor v2 Onion URL info to app
+- name: Expose source v2 onion service info to app
   copy:
     dest: /var/lib/securedrop/source_v2_url
     owner: www-data
@@ -25,7 +25,13 @@
       {{ v2_onion_url_lookup_result.stdout|default('') }}
   when: v2_onion_services
 
-- name: Expose Tor v3 Onion URL info to app
+- name: Remove source v2 onion service info if not enabled
+  file:
+    path: /var/lib/securedrop/source_v2_url
+    state: absent
+  when: not v2_onion_services
+
+- name: Expose source v3 onion service info to app
   copy:
     dest: /var/lib/securedrop/source_v3_url
     owner: www-data
@@ -34,3 +40,9 @@
     content: |
       {{ v3_onion_url_lookup_result.stdout|default('') }}
   when: v3_onion_services
+
+- name: Remove source v3 onion service info if not enabled
+  file:
+    path: /var/lib/securedrop/source_v3_url
+    state: absent
+  when: not v3_onion_services