From c794c437a8c1f15778cca97ee6a5c978c4be616a Mon Sep 17 00:00:00 2001
From: Martin Cech <marten@bx.psu.edu>
Date: Tue, 29 Jul 2025 13:23:01 +0200
Subject: [PATCH 1/2] add cache_directory_cacher_type container_resolvers
 option

also explicitly add dependency_resolvers, commented out for now
---
 group_vars/galaxyservers.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/group_vars/galaxyservers.yml b/group_vars/galaxyservers.yml
index 52c62a8..7c9695d 100644
--- a/group_vars/galaxyservers.yml
+++ b/group_vars/galaxyservers.yml
@@ -172,11 +172,19 @@ galaxy_config:
     - /cvmfs/data.galaxyproject.org/managed/location/tool_data_table_conf.xml
     # Tool Dependencies
     container_resolvers:
-    -   type: explicit_singularity
-    -   cache_directory: /cvmfs/singularity.galaxyproject.org/all/
-        type: cached_mulled_singularity
-    -   auto_install: true
-        type: mulled_singularity
+      - type: explicit_singularity
+      - type: cached_mulled_singularity
+        cache_directory: /cvmfs/singularity.galaxyproject.org/all/
+        cache_directory_cacher_type: dir_mtime
+    # dependency_resolvers:
+    #   - type: conda
+    #   - type: tool_shed_packages
+    #   - type: galaxy_packages
+    #   - type: galaxy_packages
+    #     versionless: true
+    #   - type: conda
+    #     versionless: true
+
     # Data Library Directories
     library_import_dir: "{{ csnt_library_import_dir }}"
     user_library_import_dir: "{{ csnt_user_library_import_dir }}"

From d5b3d1af93a4b3f46d7cd49b711f7557cf708fa9 Mon Sep 17 00:00:00 2001
From: Martin Cech <marten@bx.psu.edu>
Date: Tue, 29 Jul 2025 13:23:46 +0200
Subject: [PATCH 2/2] convert tabs to spaces

---
 templates/galaxy/config/tpv_rules_meta.yml.j2 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/galaxy/config/tpv_rules_meta.yml.j2 b/templates/galaxy/config/tpv_rules_meta.yml.j2
index 7f60a51..c5c3cdb 100644
--- a/templates/galaxy/config/tpv_rules_meta.yml.j2
+++ b/templates/galaxy/config/tpv_rules_meta.yml.j2
@@ -43,15 +43,15 @@ tools:
     gpus: 1
     context:
       walltime: 24
-      scratch: 25 
+      scratch: 25
       gpu_mem: 16
-    scheduling:   
+    scheduling:
       require:
         - rosettafold
 
   rosettafold2:
     inherits: testing_rosettafold2
-    scheduling:   
+    scheduling:
       require:
         - singularity