Enable and add user file sources and object store features to EU

usegalaxy-eu · Jul 18, 2024 · 3aa9cb8 · 3aa9cb8
1 parent 9065358
commit 3aa9cb8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/group_vars/gxconfig.yml b/group_vars/gxconfig.yml
@@ -364,15 +364,15 @@ base_app_main: &BASE_APP_MAIN
   # Configured Object Store templates configuration file.
   # The value of this option will be resolved with respect to
   # <config_dir>.
-  # object_store_templates_config_file: 'object_store_templates.yml'
+  object_store_templates_config_file: '{{ galaxy_config_dir }}/object_store_templates.yml'
 
   # Configured Object Store templates embedded into Galaxy's config.
   #object_store_templates: null
 
   # Configured user file source templates configuration file.
   # The value of this option will be resolved with respect to
   # <config_dir>.
-  # file_source_templates_config_file: 'file_source_templates.yml'
+  file_source_templates_config_file: '{{ galaxy_config_dir }}/file_source_templates.yml'
 
   # Configured user file source templates embedded into Galaxy's config.
   #file_source_templates: null
@@ -767,11 +767,11 @@ base_app_main: &BASE_APP_MAIN
   # for that object store entry.
   # The value of this option will be resolved with respect to
   # <cache_dir>.
-  #object_store_cache_path: object_store_cache
+  object_store_cache_path: '/data/jwd02f/s3_object_store_cache'
 
   # Default cache size for caching object stores if cache not configured
   # for that object store entry.
-  #object_store_cache_size: -1
+  object_store_cache_size: 10000
 
   # Set this to true to indicate in the UI that a user's object store
   # selection isn't simply a "preference" that job destinations often

diff --git a/group_vars/sn06.yml b/group_vars/sn06.yml
@@ -467,3 +467,7 @@ galaxy_config_templates:
     dest: "{{ tpv_mutable_dir }}/destinations.yml"
   - src: '{{ galaxy_config_template_src_dir }}/config/vault_conf.yml.j2'
     dest: '{{ galaxy_config_dir }}/vault_conf.yml'
+  - src: '{{ galaxy_config_template_src_dir }}/config/file_source_templates.yml.j2'
+    dest: "{{ galaxy_config['galaxy']['file_source_templates_config_file'] }}"
+  - src: '{{ galaxy_config_template_src_dir }}/config/object_store_templates.yml.j2'
+    dest: "{{ galaxy_config['galaxy']['object_store_templates_config_file'] }}"
diff --git a/templates/galaxy/config/file_source_templates.yml.j2 b/templates/galaxy/config/file_source_templates.yml.j2
@@ -0,0 +1,6 @@
+# This is a catalog file for all the user file source templates that are offered by EU's Galaxy server.
+- include: "{{ galaxy_server_dir }}/lib/galaxy/files/templates/examples/production_azure.yml"
+- include: "{{ galaxy_server_dir }}/lib/galaxy/files/templates/examples/production_ftp.yml"
+- include: "{{ galaxy_server_dir }}/lib/galaxy/files/templates/examples/production_s3fs.yml"
+- include: "{{ galaxy_server_dir }}/lib/galaxy/files/templates/examples/production_aws_private_bucket.yml"
+- include: "{{ galaxy_server_dir }}/lib/galaxy/files/templates/examples/production_aws_public_bucket.yml"
diff --git a/templates/galaxy/config/object_store_templates.yml.j2 b/templates/galaxy/config/object_store_templates.yml.j2
@@ -0,0 +1,5 @@
+# This is a catalog file for all the user object store templates that are offered by EU's Galaxy server.
+- include: "{{ galaxy_server_dir }}/lib/galaxy/objectstore/templates/examples/production_azure_blob.yml"
+- include: "{{ galaxy_server_dir }}/lib/galaxy/objectstore/templates/examples/production_aws_s3.yml"
+- include: "{{ galaxy_server_dir }}/lib/galaxy/objectstore/templates/examples/production_generic_s3.yml"
+- include: "{{ galaxy_server_dir }}/lib/galaxy/objectstore/templates/examples/production_gcp_s3.yml"