Merge pull request #116 from dimagi/shared_temp

Shared temp
dimagi · May 20, 2015 · 9eba57f · 9eba57f
2 parents d57f499 + c8278f8
commit 9eba57f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -12,8 +12,10 @@ shared_dir_gid: 1500  # This GID cannot already be allocated
 shared_mount_dir: "/mnt/shared_data{{ '_' ~ deploy_env if deploy_env != 'production' else '' }}"
 transfer_payload_dir_name: "transfer_payloads"
 restore_payload_dir_name: "restore_payloads"
+shared_temp_dir_name: "temp"
 transfer_payload_dir: "{{ shared_mount_dir }}/{{ transfer_payload_dir_name }}"
 restore_payload_dir: "{{ shared_mount_dir }}/{{ restore_payload_dir_name }}"
+shared_temp_dir: "{{ shared_mount_dir }}/{{ shared_temp_dir_name }}"
 public_site_path: /opt/commcare-hq-public/site/output
 commtrack_public_site_path: /opt/commtrack-static/site/output/
 cchq_user: cchq

diff --git a/ansible/roles/commcarehq/templates/localsettings.py.j2 b/ansible/roles/commcarehq/templates/localsettings.py.j2
@@ -335,6 +335,7 @@ REPORT_CACHE = 'redis'
 SHARED_DRIVE_ROOT = '{{ shared_mount_dir }}'
 RESTORE_PAYLOAD_DIR_NAME = '{{ restore_payload_dir_name }}'
 TRANSFER_FILE_DIR_NAME = '{{ transfer_payload_dir_name }}'
+SHARED_TEMP_DIR_NAME = '{{ shared_temp_dir_name }}'
 TRANSFER_SERVER = '{{ localsettings.TRANSFER_SERVER }}'
 
 memcached = {

diff --git a/ansible/roles/shared_dir/tasks/setup_host.yml b/ansible/roles/shared_dir/tasks/setup_host.yml
@@ -42,6 +42,7 @@
   with_items:
     - "{{ restore_payload_dir_host }}"
     - "{{ transfer_payload_dir_host }}"
+    - "{{ shared_temp_dir_host }}"
   tags:
     - shared_files
 
@@ -50,12 +51,13 @@
   cron:
     name: "{{ item.name }}"
     special_time: daily
-    job: "find {{ item.dir }} -type f -maxdepth 1 -mtime +4 -delete"
+    job: "find {{ item.dir }} -type f -maxdepth 1 -mtime +{{ item.max_age }} -delete"
     user: root
     cron_file: purge_cache_files
   with_items:
-    - {name: 'Purge old restore files', dir: "{{ restore_payload_dir_host }}"}
-    - {name: 'Purge old transfer files', dir: "{{ transfer_payload_dir_host }}"}
+    - {name: 'Purge old restore files', dir: "{{ restore_payload_dir_host }}", max_age: 2}
+    - {name: 'Purge old transfer files', dir: "{{ transfer_payload_dir_host }}", max_age: 2}
+    - {name: 'Purge old temp files', dir: "{{ shared_temp_dir_host }}", max_age: 1}
   tags:
     - shared_files
 
diff --git a/ansible/roles/shared_dir/vars/main.yml b/ansible/roles/shared_dir/vars/main.yml
@@ -4,3 +4,4 @@ shared_dir_groupname: nfs
 
 restore_payload_dir_host: "{{ shared_data_dir }}/{{ restore_payload_dir_name }}"
 transfer_payload_dir_host: "{{ shared_data_dir }}/{{ transfer_payload_dir_name }}"
+shared_temp_dir_host: "{{ shared_data_dir }}/{{ shared_temp_dir_name }}"