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 Jan 23, 2024
1 parent 97227f3 commit a7ac10a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 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: irods_runtime_irods_service_status.rc == 0
10 changes: 8 additions & 2 deletions roles/irods_runtime/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
---
# copyright Utrecht University

- name: Check if systemd service is active for handler

Check failure on line 4 in roles/irods_runtime/tasks/main.yml

View workflow job for this annotation

GitHub Actions / build

command-instead-of-module

systemctl used in place of systemd module

Check failure on line 4 in roles/irods_runtime/tasks/main.yml

View workflow job for this annotation

GitHub Actions / build

no-changed-when

Commands should not change things if nothing needs doing.
ansible.builtin.command: "systemctl is-active irods"
register: irods_runtime_irods_service_status
ignore_errors: true


- name: Ensure old iRODS packages are absent
ansible.builtin.package:
name:
Expand Down Expand Up @@ -32,8 +38,8 @@
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
Expand Down

0 comments on commit a7ac10a

Please # to comment.