Merge pull request #132 from martenson/umsa-shed

allow custom toolsheds, add TTS to umsa

Author: martenson

files/galaxy-umsa.grid.cesnet.cz/config/tool_sheds_conf.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<tool_sheds>
+    <tool_shed name="Galaxy Main Tool Shed" url="https://toolshed.g2.bx.psu.edu/"/>
+    <tool_shed name="Galaxy Test Tool Shed" url="https://testtoolshed.g2.bx.psu.edu/"/>
+</tool_sheds>

group_vars/galaxyservers.yml

@@ -33,6 +33,7 @@ csnt_tool_config_file:
 csnt_library_import_dir: null
 csnt_user_library_import_dir: null
 csnt_allow_path_paste: false
+csnt_tool_sheds_config_file: "{{ galaxy_root }}/server/config/tool_sheds_conf.xml.sample"
 admin_ssh_keys: false
 enable_telegraf: false
 enable_flower: false
@@ -113,6 +114,7 @@ galaxy_config:
     job_config: "{{ galaxy_job_config }}" # Use the variable we defined above
     vault_config_file: vault_conf.yml
     tool_config_file: "{{ csnt_tool_config_file }}"
+    tool_sheds_config_file: "{{ csnt_tool_sheds_config_file }}"
     sanitize_allowlist_file: "{{ galaxy_mutable_config_dir }}/sanitize_allowlist.txt"
     # SQL Performance
     slow_query_log_threshold: 5

host_vars/galaxy-umsa.grid.cesnet.cz/vars.yml

@@ -13,6 +13,7 @@ csnt_short_term_storage_dir: /rbd/data/short_term_web_storage
 csnt_tool_config_file:
 - "{{ galaxy_config_dir }}/tool_conf.xml"
 - "{{ galaxy_config_dir }}/local_tool_conf.xml"
+csnt_tool_sheds_config_file: "{{ galaxy_config_dir }}/tool_sheds_conf.xml"
 # csnt_edam_panel_views: operations,topics
 # csnt_default_panel_view: all_tools
 csnt_allow_path_paste: true
@@ -39,5 +40,7 @@ galaxy_config_files:
     dest: "{{ galaxy_config_dir }}/tool_conf.xml"
   - src: files/galaxy/config/oidc_config.xml
     dest: "{{ galaxy_config_dir }}/oidc_config.xml"
+  - src: "files/{{ inventory_hostname }}/config/tool_sheds_conf.xml"
+    dest: "{{ galaxy_config_dir }}/tool_sheds_conf.xml"
 #  - src: "files/{{ inventory_hostname }}/all_tools.yml"
 #    dest: "{{ galaxy_config_dir }}/plugins/activities/all_tools.yml"