fix default restarter

galaxyproject · Jun 2, 2021 · a51be37 · a51be37
1 parent 74f824f
commit a51be37
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -279,6 +279,7 @@ galaxy_client_build_steps:
 
 
 # systemd options
+galaxy_restart_handler_name: "{{ 'systemd-handler' if galaxy_systemd.mode == 'mule' else 'default restart galaxy handler' }}"
 galaxy_systemd:
     env: "" #Any extra env vars
     mode: mule

diff --git a/handlers/main.yml b/handlers/main.yml
@@ -13,3 +13,17 @@
     subject: "Galaxy instance {{ galaxy_instance_hostname | default( inventory_hostname ) }} is at commit {{ galaxy_commit_id }}"
     body: " "
   when: galaxy_admin_email_to is defined
+
+- name: daemon reload
+  systemd:
+    daemon_reload: yes
+
+- name: galaxy mule start
+  systemd:
+      name: galaxy.service
+      state: started
+
+- name: galaxy mule restart
+  systemd:
+      name: galaxy.service
+      state: restarted
diff --git a/tasks/clone.yml b/tasks/clone.yml
@@ -15,7 +15,7 @@
       diff: "{{ galaxy_diff_mode_verbose }}"
       register: __galaxy_git_update_result
       notify:
-        - "{{ galaxy_restart_handler_name | default('default restart galaxy handler') }}"
+        - "{{ galaxy_restart_handler_name }}"
         - email administrator with commit id
 
     - name: Report Galaxy version change

diff --git a/tasks/static_setup.yml b/tasks/static_setup.yml
@@ -15,7 +15,7 @@
         backup: "{{ galaxy_backup_configfiles }}"
       with_items: "{{ galaxy_config_files }}"
       notify:
-        - "{{ galaxy_restart_handler_name | default('default restart galaxy handler') }}"
+        - "{{ galaxy_restart_handler_name }}"
 
     - name: Install additional Galaxy config files (template)
       template:
@@ -24,7 +24,7 @@
         backup: "{{ galaxy_backup_configfiles }}"
       with_items: "{{ galaxy_config_templates }}"
       notify:
-        - "{{ galaxy_restart_handler_name | default('default restart galaxy handler') }}"
+        - "{{ galaxy_restart_handler_name }}"
 
     - name: Install local tools
       copy:
@@ -78,7 +78,7 @@
         dest: "{{ galaxy_config_file }}"
         backup: "{{ galaxy_backup_configfiles }}"
       notify:
-        - "{{ galaxy_restart_handler_name | default('default restart galaxy handler') }}"
+        - "{{ galaxy_restart_handler_name }}"
 
   remote_user: "{{ galaxy_remote_users.privsep | default(__galaxy_remote_user) }}"
   become: "{{ true if galaxy_become_users.privsep is defined else __galaxy_become }}"

diff --git a/tasks/systemd-mule.yml b/tasks/systemd-mule.yml
@@ -12,7 +12,7 @@
         dest: /etc/systemd/system/galaxy.service
       notify:
         - daemon reload
-        - galaxy mule start
+        - galaxy mule restart
 
     - name: Enable Galaxy Unit
       systemd: