From f5451c81a27ba3ea6e67475f89c030fd5d583a31 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Fri, 5 Jan 2024 16:06:16 +0000 Subject: [PATCH 1/2] Only copy pg cert to server when postgresql_use_ssl --- roles/xnat/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/xnat/tasks/main.yml b/roles/xnat/tasks/main.yml index 551c4bab..846065e1 100644 --- a/roles/xnat/tasks/main.yml +++ b/roles/xnat/tasks/main.yml @@ -17,6 +17,7 @@ owner: "{{ postgresql_client_ssl_certificate.owner }}" group: "{{ postgresql_client_ssl_certificate.group }}" mode: "0600" + when: postgresql_use_ssl - name: "Configure XNAT directories" ansible.builtin.include_tasks: directories.yml From 3f7a46e7f4a5e06599f531e6274d7fe826468681 Mon Sep 17 00:00:00 2001 From: "Patrick J. Roddy" Date: Fri, 5 Jan 2024 16:20:12 +0000 Subject: [PATCH 2/2] Further delay XNAT --- .../resources/install_xnat/inventory/group_vars/web.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/molecule/resources/install_xnat/inventory/group_vars/web.yml b/tests/molecule/resources/install_xnat/inventory/group_vars/web.yml index 7ff8d85a..acd14263 100644 --- a/tests/molecule/resources/install_xnat/inventory/group_vars/web.yml +++ b/tests/molecule/resources/install_xnat/inventory/group_vars/web.yml @@ -21,4 +21,4 @@ firewalld_public_zone_ports: # Some times the default admin account hasn't finished creating even after tomcat has started # Add a delay here to give the admin account a chance to be created # Note, this issue only seems to happen in CI -xnat_wait_for_tomcat: 10 +xnat_wait_for_tomcat: 15