move around files

bgruening · Nov 26, 2024 · 5333efa · 5333efa
1 parent add982e
commit 5333efa
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/...y/ansible/templates/production_b2drop.yml → galaxy/ansible/files/production_b2drop.yml b/...y/ansible/templates/production_b2drop.yml → galaxy/ansible/files/production_b2drop.yml
@@ -18,7 +18,7 @@
     password:
       label: Password
       help: |
-        The password to use to connect to B2DROP. 
+        The password to use to connect to B2DROP.
   configuration:
     type: webdav
     url: 'https://b2drop.bsc.es'

diff --git a/galaxy/ansible/galaxy_file_source_templates.yml b/galaxy/ansible/galaxy_file_source_templates.yml
@@ -2,10 +2,24 @@
   connection: local
   remote_user: root
   tasks:
+    - name: Install fs.webdavfs for Galaxy's file source plugins
+      pip:
+        name: "fs.webdavfs"
+        extra_args: "--index-url https://wheels.galaxyproject.org/simple/ --extra-index-url https://pypi.python.org/simple"
+        virtualenv: "{{ galaxy_venv_dir }}"
+      environment:
+        PYTHOPATH: null
+        VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
+      become_user: "{{ galaxy_user_name }}"
+
     - name: "Setup user configurable file source templates, also called BYOD"
       template: src=file_source_templates.yml.j2 dest={{ galaxy_file_source_templates_config_file }} owner={{ galaxy_user_name }} group={{ galaxy_user_name }}
 
     - name: "Copy B2Drop file source template"
-      template: src=production_b2drop.yml dest=/galaxy/lib/galaxy/files/templates/examples/production_b2drop.yml owner={{ galaxy_user_name }} group={{ galaxy_user_name }}
-
-
+      ansible.builtin.copy:
+        src: "./ansible/files/production_b2drop.yml"
+        dest: "/galaxy/lib/galaxy/files/templates/examples/production_b2drop.yml"
+        owner: "{{ galaxy_user_name }}"
+        group: "{{ galaxy_user_name }}"
+        mode: '0644'
+
diff --git a/galaxy/ansible/rabbitmq.yml b/galaxy/ansible/rabbitmq.yml
@@ -2,7 +2,7 @@
   connection: local
   remote_user: root
   vars:
-    rabbitmq_version: 4.0.3
+    rabbitmq_version: 4.0.4
     rabbitmq_apt_repository: "deb [signed-by=/etc/apt/trusted.gpg.d/rabbitmq-9F4587F226208342.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main"
     rabbitmq_apt_gpg_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key
     erlang_apt_repository: "deb [signed-by=/etc/apt/trusted.gpg.d/erlang-E495BB49CC4BBE5B.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main"