From 347748dc21ff97b9b09958115480329fff0a16fa Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Mon, 5 Feb 2024 15:47:16 -0500
Subject: [PATCH] Support external (outside the venv) Gravity

---
 defaults/main.yml          | 1 +
 handlers/gravity_22.05.yml | 4 ++--
 handlers/gravity_23.0.yml  | 4 ++--
 tasks/gravity.yml          | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 3f10cc7..8cf7d76 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -457,6 +457,7 @@ galaxy_node_version_max: >-
 __galaxy_gravity_pm: "{{ (galaxy_config_merged.gravity | default({})).process_manager | default('supervisor') }}"
 __galaxy_gravity_instance_name: "{{ (galaxy_config_merged.gravity | default({})).instance_name | default(none) }}"
 galaxy_gravity_wrapper_path: "/usr/local/bin/galaxyctl{{ __galaxy_gravity_instance_name | ternary('-' ~ __galaxy_gravity_instance_name, '') }}"
+galaxy_gravity_command: "{{ galaxy_venv_dir }}/bin/galaxyctl"
 
 # Currently `mule` (aka uWSGI) and `gravity` (runs Galaxy 22.01+ under gunicorn) are supported
 galaxy_systemd_mode: "{{ 'mule' if __galaxy_major_version is version('22.05', '<') else 'gravity' }}"
diff --git a/handlers/gravity_22.05.yml b/handlers/gravity_22.05.yml
index 4760855..2c8687a 100644
--- a/handlers/gravity_22.05.yml
+++ b/handlers/gravity_22.05.yml
@@ -2,13 +2,13 @@
 # handlers for gravity as used in galaxy version 22.05
 
 - name: galaxy gravity restart
-  command: "{{ galaxy_venv_dir }}/bin/galaxyctl graceful"
+  command: "{{ galaxy_gravity_command }} graceful"
   environment:
     GRAVITY_STATE_DIR: "{{ galaxy_gravity_state_dir }}"
   listen: "restart galaxy"
 
 - name: galaxyctl update
-  command: "{{ galaxy_venv_dir }}/bin/galaxyctl update"
+  command: "{{ galaxy_gravity_command }} update"
   environment:
     GRAVITY_STATE_DIR: "{{ galaxy_gravity_state_dir }}"
   listen: "galaxyctl update"
diff --git a/handlers/gravity_23.0.yml b/handlers/gravity_23.0.yml
index 36c3d50..12b703c 100644
--- a/handlers/gravity_23.0.yml
+++ b/handlers/gravity_23.0.yml
@@ -2,13 +2,13 @@
 # handlers for gravity as used in galaxy version 23.0
 
 - name: galaxyctl update
-  command: "{{ galaxy_venv_dir }}/bin/galaxyctl -c {{ galaxy_config_file }} update"
+  command: "{{ galaxy_gravity_command }} -c {{ galaxy_config_file }} update"
   listen: "galaxyctl update"
   become: yes
   become_user: "{{ (__galaxy_gravity_pm == 'systemd' and galaxy_systemd_root) | ternary('root', __galaxy_user_name) }}"
 
 - name: galaxy gravity restart
-  command: "{{ galaxy_venv_dir }}/bin/galaxyctl -c {{ galaxy_config_file }} graceful"
+  command: "{{ galaxy_gravity_command }} -c {{ galaxy_config_file }} graceful"
   listen: "restart galaxy"
   become: yes
   become_user: "{{ (__galaxy_gravity_pm == 'systemd' and galaxy_systemd_root) | ternary('root', __galaxy_user_name) }}"
diff --git a/tasks/gravity.yml b/tasks/gravity.yml
index f14acda..1d38e40 100644
--- a/tasks/gravity.yml
+++ b/tasks/gravity.yml
@@ -6,7 +6,7 @@
   block:
 
     - name: Register Galaxy config with Gravity (Gravity < 1)
-      command: "{{ galaxy_venv_dir }}/bin/galaxyctl register {{ galaxy_config_file }}"
+      command: "{{ galaxy_gravity_command }} register {{ galaxy_config_file }}"
       args:
         creates: "{{ galaxy_gravity_state_dir }}/configstate.yaml"
 
@@ -21,7 +21,7 @@
     content: |
       #!/usr/bin/env sh
       export GRAVITY_CONFIG_FILE={{ galaxy_config_file | quote }}
-      exec {{ (galaxy_venv_dir ~ '/bin/galaxyctl') | quote }} "$@"
+      exec {{ galaxy_gravity_command | quote }} "$@"
     dest: "{{ galaxy_gravity_wrapper_path }}"
     mode: "0755"
   when: galaxy_gravity_wrapper_path is not none