Skip to content

Commit

Permalink
Improve iRODS runtime patch for 4.2.12
Browse files Browse the repository at this point in the history
Ensure that patch can be applied independently of whether iRODS
has already been installed
  • Loading branch information
stsnel committed Feb 19, 2024
1 parent 26e0fa4 commit dcad7c9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
4 changes: 0 additions & 4 deletions roles/irods_runtime/defaults/main.yml

This file was deleted.

2 changes: 2 additions & 0 deletions roles/irods_runtime/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
ansible.builtin.service:
name: irods
state: restarted
# Only trigger a restart if the irods service is active.
when: not ansible_check_mode and irods_runtime_irods_service_status.rc == 0
14 changes: 11 additions & 3 deletions roles/irods_runtime/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
---
# copyright Utrecht University

- name: Check if systemd service is active for handler
# noqa command-instead-of-module
ansible.builtin.command: "systemctl is-active irods"
register: irods_runtime_irods_service_status
ignore_errors: true
changed_when: false


- name: Ensure old iRODS packages are absent
ansible.builtin.package:
name:
Expand Down Expand Up @@ -32,10 +40,10 @@
url: https://yoda.uu.nl/irods-patches/libirods_server.so.4.2.12
dest: /usr/lib/libirods_server.so.4.2.12
checksum: sha256:11bb77ff1f17faac1052b891cf6d75a0f55a55814a4ecbad53e1469aca96c1d2
owner: '{{ irods_service_account }}'
group: '{{ irods_service_account }}'
owner: 'root'
group: 'root'
mode: '0644'
force: true
backup: true
notify: Restart iRODS
when: libirods_server_checksum.stdout.split()[0] != '11bb77ff1f17faac1052b891cf6d75a0f55a55814a4ecbad53e1469aca96c1d2'
when: not ansible_check_mode and libirods_server_checksum.stdout.split()[0] != '11bb77ff1f17faac1052b891cf6d75a0f55a55814a4ecbad53e1469aca96c1d2'

0 comments on commit dcad7c9

Please sign in to comment.