From 5a3a368122da63c55d5241bee6495617b9848423 Mon Sep 17 00:00:00 2001
From: Sanjay Kumar Srikakulam <sanjaysrikakulam@gmail.com>
Date: Thu, 25 Jul 2024 10:42:32 +0000
Subject: [PATCH 1/2] Bring your own file source: Add webdav template and
 update ansible conf

---
 .../production_webdav.yml                     | 44 +++++++++++++++++++
 group_vars/sn06.yml                           |  4 ++
 .../config/file_source_templates.yml.j2       |  3 ++
 3 files changed, 51 insertions(+)
 create mode 100644 files/galaxy/config/file_source_templates/production_webdav.yml

diff --git a/files/galaxy/config/file_source_templates/production_webdav.yml b/files/galaxy/config/file_source_templates/production_webdav.yml
new file mode 100644
index 000000000..7dcccee57
--- /dev/null
+++ b/files/galaxy/config/file_source_templates/production_webdav.yml
@@ -0,0 +1,44 @@
+- id: webdav
+  version: 0
+  name: WebDAV
+  description: |
+    The WebDAV protocol is a simple way to access files over the internet. This template
+    configuration allows you to connect to a WebDAV server.
+  variables:
+    url:
+      label: Server Domain (e.g. https://myowncloud.org)
+      type: string
+      help: |
+        The domain of the WebDAV server you are connecting to. This should be the full URL
+        including the protocol (http or https) and the domain name.
+    root:
+      label: WebDAV server Path (should end with /remote.php/webdav, e.g. /a/sub/path/remote.php/webdav)
+      type: string
+      help: |
+        The full server path to the WebDAV service. Ensure the path includes /remote.php/webdav.
+    login:
+      label: Username
+      type: string
+      help: |
+        The username to use to connect to the WebDAV server. This should be the username you use
+        to log in to the WebDAV server.
+    writable:
+      label: Writable?
+      type: boolean
+      default: false
+      help: Allow Galaxy to write data to this WebDAV server.
+  secrets:
+    password:
+      label: Password
+      help: |
+        The password to use to connect to the WebDAV server. This should be the password you use
+        to log in to the WebDAV server.
+  configuration:
+    type: webdav
+    url: '{{ variables.url }}'
+    root: '{{ variables.root }}'
+    login: '{{ variables.login }}'
+    writable: '{{ variables.writable }}'
+    password: '{{ secrets.password }}'
+    use_temp_files: true
+    temp_path: /data/jwd04/tmp
\ No newline at end of file
diff --git a/group_vars/sn06.yml b/group_vars/sn06.yml
index d28a75c2b..946f8641b 100644
--- a/group_vars/sn06.yml
+++ b/group_vars/sn06.yml
@@ -292,6 +292,7 @@ galaxy_server_dir: "{{ galaxy_root }}/server"
 galaxy_config_dir: "{{ galaxy_root }}/config"
 galaxy_venv_dir: "{{ galaxy_root }}/venv"
 galaxy_job_working_directory: "{{ galaxy_config['galaxy']['job_working_directory'] }}"
+galaxy_file_source_templates_dir: "{{ galaxy_mutable_config_dir }}/file_source_templates"
 ucsc_build_sites:
 
 galaxy_virtualenv_command: "{{ conda_prefix }}/envs/_galaxy_/bin/python -m venv --copies"
@@ -318,6 +319,7 @@ galaxy_dirs:
   - "{{ galaxy_log_dir }}"
   - "{{ galaxy_config_dir }}/total_perspective_vortex"
   - "{{ tpv_mutable_dir }}"
+  - "{{ galaxy_file_source_templates_dir }}"
 
 galaxy_instance_hostname: usegalaxy.eu
 galaxy_config_style: yaml
@@ -422,6 +424,8 @@ galaxy_config_files:
     dest: "{{ tpv_mutable_dir }}/interactive_tools.yml"
   - src: "{{ galaxy_config_file_src_dir }}/tpv/users.yml"
     dest: "{{ tpv_mutable_dir }}/users.yml"
+  - src: "{{ galaxy_config_file_src_dir }}/config/file_source_templates/production_webdav.yml"
+    dest: "{{ galaxy_file_source_templates_dir }}/production_webdav.yml"
 
   #- src: files/galaxy/config/job_resource_params_conf.xml
   #dest: "{{ galaxy_config['app:main']['job_resource_params_file'] }}"
diff --git a/templates/galaxy/config/file_source_templates.yml.j2 b/templates/galaxy/config/file_source_templates.yml.j2
index 071bd4a6d..38e228d1f 100644
--- a/templates/galaxy/config/file_source_templates.yml.j2
+++ b/templates/galaxy/config/file_source_templates.yml.j2
@@ -4,3 +4,6 @@
 - 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"
+
+# These templates are maintained by EU
+- include: "{{ galaxy_file_source_templates_dir }}/production_webdav.yml"

From f5faf4c9f469088cc0d9c6c4f515b3f2958eabb1 Mon Sep 17 00:00:00 2001
From: Sanjay Kumar Srikakulam <sanjaysrikakulam@gmail.com>
Date: Thu, 25 Jul 2024 10:46:35 +0000
Subject: [PATCH 2/2] lint fix

---
 files/galaxy/config/file_source_templates/production_webdav.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/galaxy/config/file_source_templates/production_webdav.yml b/files/galaxy/config/file_source_templates/production_webdav.yml
index 7dcccee57..cf1429a34 100644
--- a/files/galaxy/config/file_source_templates/production_webdav.yml
+++ b/files/galaxy/config/file_source_templates/production_webdav.yml
@@ -41,4 +41,4 @@
     writable: '{{ variables.writable }}'
     password: '{{ secrets.password }}'
     use_temp_files: true
-    temp_path: /data/jwd04/tmp
\ No newline at end of file
+    temp_path: /data/jwd04/tmp