Merge pull request #14 from mvdbeek/create_tool_dependency_dir

Ensure tool_dependency_dir exists
galaxyproject · Jun 17, 2016 · 7ccdf33 · 7ccdf33
2 parents 0f78dde + 144b3c6
commit 7ccdf33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -39,6 +39,7 @@ galaxy_venv_dir: "{{ galaxy_server_dir }}/.venv"
 # By default, everything lives in the Galaxy clone
 galaxy_config_dir: "{{ galaxy_server_dir }}"
 galaxy_mutable_config_dir: "{{ galaxy_server_dir }}"
+galaxy_tool_dependency_dir: "{{ galaxy_mutable_data_dir }}/dependencies"
 galaxy_mutable_data_dir: "{{ galaxy_server_dir }}/database"
 galaxy_config_file: "{{ galaxy_config_dir }}/galaxy.ini"
 galaxy_shed_tool_conf_file: "{{ galaxy_mutable_config_dir }}/shed_tool_conf.xml"
@@ -67,6 +68,7 @@ galaxy_config_default:
     file_path: "{{ galaxy_mutable_data_dir }}/datasets"
     new_file_path: "{{ galaxy_mutable_data_dir }}/tmp"
     job_working_directory: "{{ galaxy_mutable_data_dir }}/jobs"
+    tool_dependency_dir: "{{ galaxy_tool_dependency_dir }}"
     template_cache_path: "{{ galaxy_mutable_data_dir }}/template_cache"
     whoosh_index_dir: "{{ galaxy_mutable_data_dir }}/whoosh_cache"
     object_store_cache_path: "{{ galaxy_mutable_data_dir }}/object_store_cache"

diff --git a/tasks/mutable_setup.yml b/tasks/mutable_setup.yml
@@ -1,8 +1,11 @@
 ---
 # Instantiate mutable config files
 
-- name: Create mutable configuration file directory
-  file: state=directory path={{ galaxy_mutable_config_dir }}
+- name: Create mutable configuration file directories
+  file: state=directory path={{ item }}
+  with_items:
+    - "{{ galaxy_mutable_config_dir }}"
+    - "{{ galaxy_tool_dependency_dir }}"
 
 - name: Instantiate mutable configuration files
   command: cp {{ item.src }} {{ item.dest }} creates={{ item.dest }}