Stop using jwd04

group_vars/gxconfig.yml

@@ -147,7 +147,7 @@ base_app_main: &BASE_APP_MAIN
   # Pulsar.
   # The value of this option will be resolved with respect to
   # <data_dir>.
-  new_file_path: /data/jwd04/tmp
+  new_file_path: "{{ jwd.jwd05e.path }}/tmp"
 
   # Maximum size of uploadable files, specified in bytes (default:
   # 100GB). This value is ignored if an external upload server is
@@ -337,7 +337,7 @@ base_app_main: &BASE_APP_MAIN
   # external tooling.
   # The value of this option will be resolved with respect to
   # <cache_dir>.
-  short_term_storage_dir: '/data/jwd04/short_term_web_storage'
+  short_term_storage_dir: "{{ jwd.jwd05e.path }}/short_term_web_storage"
 
   # Default duration before short term web storage files will be cleaned
   # up by Galaxy tasks (in seconds). The default duration is 1 day.
@@ -521,7 +521,7 @@ base_app_main: &BASE_APP_MAIN
   # directories will be created.
   # The value of this option will be resolved with respect to
   # <data_dir>.
-  job_working_directory: /data/jwd04/main
+  job_working_directory: "{{ jwd.jwd05e.path }}/main"
 
   # Mako templates are compiled as needed and cached for reuse, this
   # directory is used for the cache
@@ -1149,7 +1149,7 @@ base_app_main: &BASE_APP_MAIN
   # in detail in the documentation linked above.  The upload store is a
   # temporary directory in which files uploaded by the upload module
   # will be placed.
-  nginx_upload_store: "/data/jwd04/nginx_upload/main/uploads"
+  nginx_upload_store: "{{ jwd.jwd05e.path }}/nginx_upload/main/uploads"
 
   # This value overrides the action set on the file upload form, e.g.
   # the web path where the nginx_upload_module has been configured to
@@ -1160,7 +1160,7 @@ base_app_main: &BASE_APP_MAIN
   # upon job completion by remote job runners (i.e. Pulsar) that
   # initiate staging operations on the remote end.  See the Galaxy nginx
   # documentation for the corresponding nginx configuration.
-  nginx_upload_job_files_store: "/data/jwd04/nginx_upload/main/jobfiles"
+  nginx_upload_job_files_store: "{{ jwd.jwd05e.path }}/nginx_upload/main/jobfiles"
 
   # Galaxy can also use nginx_upload_module to receive files staged out
   # upon job completion by remote job runners (i.e. Pulsar) that
@@ -1171,7 +1171,7 @@ base_app_main: &BASE_APP_MAIN
   # The upload store is a temporary directory in which files uploaded by
   # the tus middleware or server will be placed. Defaults to
   # new_file_path if not set.
-  tus_upload_store: "/data/jwd04/tus_upload/main"
+  tus_upload_store: "{{ jwd.jwd05e.path }}/tus_upload/main"
 
   # Galaxy can upload user files in chunks without using nginx. Enable
   # the chunk uploader by specifying a chunk size larger than 0. The

group_vars/maintenance.yml

@@ -11,9 +11,9 @@ galaxy_log_dir: "/var/log/galaxy"
 
 galaxy_config:
   galaxy:
-    job_working_directory: /data/jwd04/main
-    nginx_upload_store: "/data/jwd04/nginx_upload/main/uploads"
-    nginx_upload_job_files_store: "/data/jwd04/nginx_upload/main/jobfiles"
+    job_working_directory: "{{ jwd.jwd05e.path }}/main"
+    nginx_upload_store: "{{ jwd.jwd05e.path }}/nginx_upload/main/uploads"
+    nginx_upload_job_files_store: "{{ jwd.jwd05e.path }}/nginx_upload/main/jobfiles"
     ftp_upload_dir: /data/jwd01/incoming
 
 galaxy_group:
@@ -116,7 +116,7 @@ fsm_scripts:
       - /data/dnb06/galaxy_db/tmp
       - /data/jwd/tmp
       - /data/jwd02f/tmp
-      - /data/jwd04/tmp
+      - /data/jwd05e/tmp
     time: "{{ fsm_intervals.long }}"
   upload_dirs:
     enable: true
@@ -141,7 +141,6 @@ fsm_scripts:
       - /data/jwd01/main
       - /data/jwd02f/main
       - /data/jwd03f/main
-      - /data/jwd04/main
       - /data/jwd05e/main
     time: "{{ fsm_intervals.long }}"
 fsm_htcondor_enable: true

templates/galaxy/config/file_sources_conf.yml.j2

@@ -10,7 +10,7 @@
   url: https://b2drop.eudat.eu
   root: /remote.php/dav/files/${user.preferences['b2drop|username']}/
   use_temp_files: true
-  temp_path: /data/jwd04/tmp
+  temp_path: "{{ jwd.jwd05e.path }}/tmp"
   login: ${user.preferences['b2drop|username']} 
   password: ${user.preferences['b2drop|password']}
 
@@ -22,7 +22,7 @@
   url: ${user.preferences['nextcloud|url']}
   root: ${user.preferences['nextcloud|root']}
   use_temp_files: true
-  temp_path: /data/jwd04/tmp
+  temp_path: "{{ jwd.jwd05e.path }}/tmp"
   login: ${user.preferences['nextcloud|username']}
   password: ${user.preferences['nextcloud|password']}
 
@@ -34,7 +34,7 @@
   url: 'https://ergapilot.bsc.es'
   root: '/remote.php/webdav'
   use_temp_files: true
-  temp_path: /data/jwd04/tmp
+  temp_path: "{{ jwd.jwd05e.path }}/tmp"
   login: "{{ erga_nextcloud_login }}"
   password: "{{ erga_nextcloud_password }}"
   requires_groups: erga

templates/galaxy/config/object_store_conf.xml.j2

@@ -142,7 +142,7 @@ The storage consists of 16 Gen6 type A200 storage nodes and 16 Gen5 type X410 no
         </backend>
         <backend id="files16" type="disk" weight="0" store_by="uuid">
             <files_dir path="/data/dnb07/galaxy_db/files"/>
-            <extra_dir type="job_work" path="/data/jwd04/main"/>
+            <extra_dir type="job_work" path="{{ jwd.jwd05e.path }}/main"/>
         </backend>
         <backend id="files17" type="disk" weight="0" store_by="uuid">
             <files_dir path="/data/dnb07/galaxy_db/files"/>
@@ -155,7 +155,7 @@ The storage consists of 16 Gen6 type A200 storage nodes and 16 Gen5 type X410 no
         <backend id="files19" type="disk" weight="0" store_by="uuid">
             <files_dir path="/data/dnb08/galaxy_db/files"/>
             <!-- same than jwd05e, but unecrypted, so use jwd05e instead -->
-            <extra_dir type="job_work" path="/data/jwd04/main"/>
+            <extra_dir type="job_work" path="{{ jwd.jwd05e.path }}/main"/>
         </backend>
         <backend id="files20" type="disk" weight="0" store_by="uuid">
             <files_dir path="/data/dnb08/galaxy_db/files"/>
@@ -196,7 +196,7 @@ The storage consists of 16 Gen6 type A200 storage nodes and 16 Gen5 type X410 no
         </backend>
         <backend id="files26" type="disk" weight="0" store_by="uuid">
             <files_dir path="/data/dnb09/galaxy_db/files"/>
-            <extra_dir type="job_work" path="/data/jwd04/main"/>
+            <extra_dir type="job_work" path="{{ jwd.jwd05e.path }}/main"/>
         </backend>
 
         <backend id="secondary" type="disk" weight="0" store_by="id">

upload.yml

@@ -8,8 +8,8 @@
     - mounts/mountpoints.yml
     - mounts/dest/all.yml
   vars:
-    upload_dir_test: "{{ jwd.jwd04.path }}/tus_upload/test"
-    upload_dir_main: "{{ jwd.jwd04.path }}/tus_upload/main"
+    upload_dir_test: "{{ jwd.jwd05e.path }}/tus_upload/test"
+    upload_dir_main: "{{ jwd.jwd05e.path }}/tus_upload/main"
     rustus_version: "0.7.4"
     rustus_instances:
       - name: test_uploads