iRODS: v0.9.8

roles/irods/handlers/main.yml

@@ -0,0 +1,17 @@
+---
+- name: Restarting PGSQL and making sure it is enabled
+  ansible.builtin.systemd:
+    name: postgresql
+    state: restarted
+    enabled: true
+  become: true
+  listen: restart_postgresql
+
+# Start/stop/restart service call fails if with error if already in that state
+# so it's best if done via user call (as this is what the service does anyways)
+- name: Restart iRODS server manually as {{ irods_service_account }} user
+  command: /var/lib/irods/irodsctl restart
+  become_user: '{{ irods_service_account }}'
+  become: true
+  listen: irodsctl_restart
+...

roles/irods/tasks/icat.yml

@@ -1,3 +1,4 @@
+---
 # installing the iRODS ICAT
 - name: Create {{ irods_service_account }} group
   group:
@@ -18,14 +19,15 @@
   loop:
     - irods-server
     - irods-database-plugin-postgres
-    - irods-resource-plugin-s3-4.2.10.0-1
+    - irods-resource-plugin-s3
     - irods-rule-engine-plugin-python
   become: true
 
 - name: Make sure that the hostname is set correct FQDN name
   ansible.builtin.hostname:
     name: '{{ irods_icat_fqdn }}'
   become: true
+  notify: irodsctl_restart 
 
 - name: Ensure that /etc/irods directory exists and is owned by {{ irods_service_account }}
   ansible.builtin.file:
@@ -51,15 +53,17 @@
     - name: '{{ irods_ssl_certificate_chain_file }}'
       mode: '0644'
   become: true
+  notify: irodsctl_restart 
 
 - name: If missing, build 4096 bit DHparam /etc/irods/{{ irods_ssl_dh_params_file }} file (takes several minues ...)
   ansible.builtin.command:
-    cmd: /bin/openssl dhparam -2 -out /etc/irods/{{ irods_ssl_dh_params_file }} 4096
+    cmd: /bin/openssl dhparam -2 -out /etc/irods/{{ irods_ssl_dh_params_file }} 2048
     creates: /etc/irods/{{ irods_ssl_dh_params_file }}
   register: result
   failed_when:
     - result.rc != 0
   become: true
+  notify: irodsctl_restart 
 
 - name: Set ownership of {{ irods_ssl_dh_params_file }}
   ansible.builtin.file:
@@ -77,21 +81,14 @@
   register: create_unattended_installation_json
   become: true
 
-# - name: Check if {{ irods_db_name }} database is available
-#  postgresql_ping:
-#    db: "{{ irods_db_name }}"
-#  register: check_database
-#  become_user: postgres
-#  become: true
-#
 - name: Create a new database "{{ irods_db_name }}" if missing
   postgresql_db:
     name: "{{ irods_db_name }}"
     state: present
-#  when: check_database.is_available is false
   register: db_created
   become_user: postgres
   become: true
+  notify: irodsctl_restart
 
 - name: Creating irods sql user and granting privileges
   postgresql_user:
@@ -104,7 +101,7 @@
   become: true
 
 - name: Collect list of tables from existing {{ irods_db_name }}
-  ansible.builtin.command: psql -d ICAT -c '\dt'
+  ansible.builtin.command: 'psql -d {{ irods_db_name }} -c "\dt"'
   changed_when: false
   register: database_tables
   become_user: postgres
@@ -118,6 +115,7 @@
   poll: 1
   become_user: '{{ irods_service_account }}'
   become: true
+  notify: irodsctl_restart
 
 - name: Edit /etc/irods/core.re to enforce the use of the certificates
   become: true
@@ -133,6 +131,20 @@
     search_string: 'acSetNumThreads {msiSetNumThreads("default","default","default"); }'
     line: 'acSetNumThreads {msiSetNumThreads("default","4","default"); }'
 
+- name: Edit /etc/irods/core.re to set default resource to {{ irods_default_resource }}
+  become: true
+  lineinfile:
+    name: /etc/irods/core.re
+    search_string: 'acSetRescSchemeForCreate {msiSetDefaultResc("demoResc","null"); }'
+    line: 'acSetRescSchemeForCreate {msiSetDefaultResc("{{ irods_default_resource }}","null"); }'
+
+- name: Edit /etc/irods/core.re to set default replication resource to {{ irods_default_resource }}
+  become: true
+  lineinfile:
+    name: /etc/irods/core.re
+    search_string: 'acSetRescSchemeForRepl {msiSetDefaultResc("demoResc","null"); }'
+    line: 'acSetRescSchemeForRepl {msiSetDefaultResc("{{ irods_default_resource }}","null"); }'
+
 - name: Increase systcl limits to allow longer transfers
   copy:
     src: '{{ role_path }}/files/irods_fix.conf'
@@ -152,16 +164,12 @@
     group: '{{ irods_service_account }}'
   become_user: '{{ irods_service_account }}'
   become: true
+  notify: irodsctl_restart
 
-- name: Enable and iRODS service
+- name: Make sure iRODS service is enabled
   sysvinit:
     name: irods
     enabled: true
+    state: started
   become: true
-
-# Start/stop/restart service call fails if with error if already in that state
-# so it's best if done via user call (as this is what the service does anyways)
-- name: Restart iRODS server manually via {{ irods_service_account }}
-  command: /var/lib/irods/irodsctl restart
-  become_user: '{{ irods_service_account }}'
-  become: true
+...

roles/irods/tasks/pgsql.yml

@@ -18,27 +18,31 @@
     creates: /var/lib/pgsql/data/pg_hba.conf
 
 - name: Fixing pg_hba.conf to permit ipv4localhost password authentication
-  become: true
   lineinfile:
     name: /var/lib/pgsql/data/pg_hba.conf
     regexp: "host    all             all             127.0.0.1/32            ident"
     line: "host    all             all             127.0.0.1/32            md5"
     backrefs: true
-  register: fixipv4
+  notify:
+    - restart_postgresql
+  become: true
 
 - name: Fixing pg_hba.conf to permit ipv6 localhost password authentication
-  become: true
   lineinfile:
     name: /var/lib/pgsql/data/pg_hba.conf
     regexp: "host    all             all             ::1/128                 ident"
     line: "host    all             all             ::1/128                 md5"
     backrefs: true
-  register: fixipv6
+  notify:
+    - restart_postgresql
+  become: true
 
-- name: Restarting PGSQL and making sure it is enabled
+- name: Enable postgresl service
   ansible.builtin.systemd:
     name: postgresql
-    state: restarted
+    state: started
     enabled: true
-  when: fixipv4.changed and fixipv6.changed
   become: true
+...
+
+