From c694b0ed8f60cb94c096e63ee4c326f0ba797844 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 1 Jan 2025 00:27:19 +0000
Subject: [PATCH 01/22] Renovate: all non-major dependencies

---
 .github/workflows/manage-projects.yaml             | 2 +-
 .github/workflows/molecule-docker.yaml             | 2 +-
 .github/workflows/molecule-firewalld.yaml          | 2 +-
 .github/workflows/molecule-install-omero.yaml      | 2 +-
 .github/workflows/molecule-install-xnat.yaml       | 2 +-
 .github/workflows/molecule-java.yaml               | 2 +-
 .github/workflows/molecule-monitoring.yaml         | 2 +-
 .github/workflows/molecule-nginx.yaml              | 2 +-
 .github/workflows/molecule-postgresql.yaml         | 2 +-
 .github/workflows/molecule-postgresql_upgrade.yaml | 2 +-
 .github/workflows/molecule-provision.yaml          | 2 +-
 .github/workflows/molecule-provision_accounts.yaml | 2 +-
 .github/workflows/molecule-python.yaml             | 2 +-
 .github/workflows/molecule-tomcat.yaml             | 2 +-
 .pre-commit-config.yaml                            | 2 +-
 meta/requirements.yml                              | 6 +++---
 playbooks/group_vars/xnat.yml                      | 2 +-
 17 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/manage-projects.yaml b/.github/workflows/manage-projects.yaml
index 06f52071..4360d5ec 100644
--- a/.github/workflows/manage-projects.yaml
+++ b/.github/workflows/manage-projects.yaml
@@ -10,7 +10,7 @@ jobs:
   add-issue-to-project:
     runs-on: ubuntu-latest
     steps:
-      - uses: UCL-MIRSG/.github/actions/add-to-project@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/add-to-project@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           app-id: ${{ secrets.APP_ID }}
           app-pem: ${{ secrets.APP_PEM }}
diff --git a/.github/workflows/molecule-docker.yaml b/.github/workflows/molecule-docker.yaml
index a19f38b9..73f5a56b 100644
--- a/.github/workflows/molecule-docker.yaml
+++ b/.github/workflows/molecule-docker.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-firewalld.yaml b/.github/workflows/molecule-firewalld.yaml
index 959b1c56..1fc0209b 100644
--- a/.github/workflows/molecule-firewalld.yaml
+++ b/.github/workflows/molecule-firewalld.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-install-omero.yaml b/.github/workflows/molecule-install-omero.yaml
index 7a30564d..06115d25 100644
--- a/.github/workflows/molecule-install-omero.yaml
+++ b/.github/workflows/molecule-install-omero.yaml
@@ -27,7 +27,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: 8
           scenario: rocky8_omero
diff --git a/.github/workflows/molecule-install-xnat.yaml b/.github/workflows/molecule-install-xnat.yaml
index af5363f3..80aae4c2 100644
--- a/.github/workflows/molecule-install-xnat.yaml
+++ b/.github/workflows/molecule-install-xnat.yaml
@@ -33,7 +33,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-java.yaml b/.github/workflows/molecule-java.yaml
index 9d2cc049..cefead87 100644
--- a/.github/workflows/molecule-java.yaml
+++ b/.github/workflows/molecule-java.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-monitoring.yaml b/.github/workflows/molecule-monitoring.yaml
index 056ea3b2..ecddcc5c 100644
--- a/.github/workflows/molecule-monitoring.yaml
+++ b/.github/workflows/molecule-monitoring.yaml
@@ -31,7 +31,7 @@ jobs:
       ANSIBLE_ROLES_PATH: ansible_collections/mirsg/infrastructure/roles
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-nginx.yaml b/.github/workflows/molecule-nginx.yaml
index 59df5844..9bc5bb0f 100644
--- a/.github/workflows/molecule-nginx.yaml
+++ b/.github/workflows/molecule-nginx.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-postgresql.yaml b/.github/workflows/molecule-postgresql.yaml
index 90db0486..8150ee6f 100644
--- a/.github/workflows/molecule-postgresql.yaml
+++ b/.github/workflows/molecule-postgresql.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-postgresql_upgrade.yaml b/.github/workflows/molecule-postgresql_upgrade.yaml
index 3ae3cd02..84ea074f 100644
--- a/.github/workflows/molecule-postgresql_upgrade.yaml
+++ b/.github/workflows/molecule-postgresql_upgrade.yaml
@@ -29,7 +29,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-provision.yaml b/.github/workflows/molecule-provision.yaml
index 4147c1c3..df589200 100644
--- a/.github/workflows/molecule-provision.yaml
+++ b/.github/workflows/molecule-provision.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-provision_accounts.yaml b/.github/workflows/molecule-provision_accounts.yaml
index 2f6bbb96..5389c458 100644
--- a/.github/workflows/molecule-provision_accounts.yaml
+++ b/.github/workflows/molecule-provision_accounts.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-python.yaml b/.github/workflows/molecule-python.yaml
index 7eacdf1e..c65fd137 100644
--- a/.github/workflows/molecule-python.yaml
+++ b/.github/workflows/molecule-python.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-tomcat.yaml b/.github/workflows/molecule-tomcat.yaml
index 37531f2d..d5dc9e0f 100644
--- a/.github/workflows/molecule-tomcat.yaml
+++ b/.github/workflows/molecule-tomcat.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@b863c874470757db8548388ab0135d573d70b48f # v0.127.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e1781f9d..0d97e83f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 ---
 repos:
   - repo: https://github.com/UCL-MIRSG/.github
-    rev: v0.127.0
+    rev: v0.182.0
     hooks:
       - id: mirsg-hooks
diff --git a/meta/requirements.yml b/meta/requirements.yml
index c4372304..61b7a86a 100644
--- a/meta/requirements.yml
+++ b/meta/requirements.yml
@@ -11,11 +11,11 @@ roles:
     version: 4.0.1
 
   - src: ome.omero_user
-    version: 0.3.1
+    version: 0.4.0
 
   # required for omero_web 4.0.1
   - src: ome.selinux_utils
-    version: 2.0.2
+    version: 2.1.1
 
   - src: ome.omero_common
     version: 0.4.0
@@ -24,4 +24,4 @@ roles:
     version: 0.2.0
 
   - src: ome.ice
-    version: 4.3.0
+    version: 4.4.4
diff --git a/playbooks/group_vars/xnat.yml b/playbooks/group_vars/xnat.yml
index 8ecca5b5..4d5d0971 100644
--- a/playbooks/group_vars/xnat.yml
+++ b/playbooks/group_vars/xnat.yml
@@ -21,7 +21,7 @@ xnat_source:
   context_file_location: /usr/share/tomcat/webapps/ROOT/META-INF/context.xml
 
 # mirsg.infrastructure.tomcat
-tomcat_version: 9.0.97
+tomcat_version: 9.0.98
 tomcat_owner: tomcat
 tomcat_group: tomcat
 

From 3b27e9faf7567a7ed08c5c9e7621ba103ed5550c Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Thu, 2 Jan 2025 19:02:23 +0000
Subject: [PATCH 02/22] v0

---
 .github/workflows/manage-projects.yaml             | 2 +-
 .github/workflows/molecule-docker.yaml             | 2 +-
 .github/workflows/molecule-firewalld.yaml          | 2 +-
 .github/workflows/molecule-install-omero.yaml      | 2 +-
 .github/workflows/molecule-java.yaml               | 2 +-
 .github/workflows/molecule-monitoring.yaml         | 2 +-
 .github/workflows/molecule-nginx.yaml              | 2 +-
 .github/workflows/molecule-postgresql.yaml         | 2 +-
 .github/workflows/molecule-postgresql_upgrade.yaml | 2 +-
 .github/workflows/molecule-provision.yaml          | 2 +-
 .github/workflows/molecule-provision_accounts.yaml | 2 +-
 .github/workflows/molecule-python.yaml             | 2 +-
 .github/workflows/molecule-tomcat.yaml             | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/manage-projects.yaml b/.github/workflows/manage-projects.yaml
index 4360d5ec..cea71839 100644
--- a/.github/workflows/manage-projects.yaml
+++ b/.github/workflows/manage-projects.yaml
@@ -10,7 +10,7 @@ jobs:
   add-issue-to-project:
     runs-on: ubuntu-latest
     steps:
-      - uses: UCL-MIRSG/.github/actions/add-to-project@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/add-to-project@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           app-id: ${{ secrets.APP_ID }}
           app-pem: ${{ secrets.APP_PEM }}
diff --git a/.github/workflows/molecule-docker.yaml b/.github/workflows/molecule-docker.yaml
index 73f5a56b..475801ea 100644
--- a/.github/workflows/molecule-docker.yaml
+++ b/.github/workflows/molecule-docker.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-firewalld.yaml b/.github/workflows/molecule-firewalld.yaml
index 1fc0209b..f1074022 100644
--- a/.github/workflows/molecule-firewalld.yaml
+++ b/.github/workflows/molecule-firewalld.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-install-omero.yaml b/.github/workflows/molecule-install-omero.yaml
index 06115d25..d7c30e1f 100644
--- a/.github/workflows/molecule-install-omero.yaml
+++ b/.github/workflows/molecule-install-omero.yaml
@@ -27,7 +27,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: 8
           scenario: rocky8_omero
diff --git a/.github/workflows/molecule-java.yaml b/.github/workflows/molecule-java.yaml
index cefead87..40c9832f 100644
--- a/.github/workflows/molecule-java.yaml
+++ b/.github/workflows/molecule-java.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-monitoring.yaml b/.github/workflows/molecule-monitoring.yaml
index ecddcc5c..fe81c739 100644
--- a/.github/workflows/molecule-monitoring.yaml
+++ b/.github/workflows/molecule-monitoring.yaml
@@ -31,7 +31,7 @@ jobs:
       ANSIBLE_ROLES_PATH: ansible_collections/mirsg/infrastructure/roles
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-nginx.yaml b/.github/workflows/molecule-nginx.yaml
index 9bc5bb0f..97aec129 100644
--- a/.github/workflows/molecule-nginx.yaml
+++ b/.github/workflows/molecule-nginx.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-postgresql.yaml b/.github/workflows/molecule-postgresql.yaml
index 8150ee6f..37ae83f3 100644
--- a/.github/workflows/molecule-postgresql.yaml
+++ b/.github/workflows/molecule-postgresql.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-postgresql_upgrade.yaml b/.github/workflows/molecule-postgresql_upgrade.yaml
index 84ea074f..c5df834f 100644
--- a/.github/workflows/molecule-postgresql_upgrade.yaml
+++ b/.github/workflows/molecule-postgresql_upgrade.yaml
@@ -29,7 +29,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-provision.yaml b/.github/workflows/molecule-provision.yaml
index df589200..75fa52ed 100644
--- a/.github/workflows/molecule-provision.yaml
+++ b/.github/workflows/molecule-provision.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-provision_accounts.yaml b/.github/workflows/molecule-provision_accounts.yaml
index 5389c458..e9417a63 100644
--- a/.github/workflows/molecule-provision_accounts.yaml
+++ b/.github/workflows/molecule-provision_accounts.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-python.yaml b/.github/workflows/molecule-python.yaml
index c65fd137..50918758 100644
--- a/.github/workflows/molecule-python.yaml
+++ b/.github/workflows/molecule-python.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.github/workflows/molecule-tomcat.yaml b/.github/workflows/molecule-tomcat.yaml
index d5dc9e0f..ab0a9296 100644
--- a/.github/workflows/molecule-tomcat.yaml
+++ b/.github/workflows/molecule-tomcat.yaml
@@ -30,7 +30,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}

From 93f5fd0478ea56eb984a0974954b404705255482 Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Thu, 2 Jan 2025 19:07:36 +0000
Subject: [PATCH 03/22] Pin OMERO packages

---
 .github/workflows/molecule-install-xnat.yaml |  2 +-
 .renovaterc.json5                            | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/molecule-install-xnat.yaml b/.github/workflows/molecule-install-xnat.yaml
index 80aae4c2..a874ed5f 100644
--- a/.github/workflows/molecule-install-xnat.yaml
+++ b/.github/workflows/molecule-install-xnat.yaml
@@ -33,7 +33,7 @@ jobs:
       ANSIBLE_FORCE_COLOR: 1
 
     steps:
-      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0.182.0
+      - uses: UCL-MIRSG/.github/actions/molecule-test@28758d17f7fe68723aded1c5dc6a3f57ccdf9cb7 # v0
         with:
           ansible_major_version: ${{ vars.ANSIBLE_MAJOR_VERSION }}
           scenario: ${{ matrix.scenario }}
diff --git a/.renovaterc.json5 b/.renovaterc.json5
index fe7de9dd..339717d2 100644
--- a/.renovaterc.json5
+++ b/.renovaterc.json5
@@ -26,6 +26,21 @@
       groupName: "xnat",
       versioning: "loose",
     },
+    {
+      "description": "RedHat8 support"
+      "matchPackageNames": ["ome.ice"],
+      "allowedVersions": "<=4.3.0"
+    },,
+    {
+      "description": "RedHat8 support"
+      "matchPackageNames": ["ome.omero_user"],
+      "allowedVersions": "<=0.3.1"
+    },,
+    {
+      "description": "RedHat8 support"
+      "matchPackageNames": ["ome.selinux_utils"],
+      "allowedVersions": "<=2.0.2"
+    },
   ],
   customDatasources: {
     "VUIIS-dax": {

From ea0965826bd3e1b6838f928dbad124f28ded90f0 Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Thu, 2 Jan 2025 19:08:43 +0000
Subject: [PATCH 04/22] Revert environments

---
 meta/requirements.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/requirements.yml b/meta/requirements.yml
index 61b7a86a..c4372304 100644
--- a/meta/requirements.yml
+++ b/meta/requirements.yml
@@ -11,11 +11,11 @@ roles:
     version: 4.0.1
 
   - src: ome.omero_user
-    version: 0.4.0
+    version: 0.3.1
 
   # required for omero_web 4.0.1
   - src: ome.selinux_utils
-    version: 2.1.1
+    version: 2.0.2
 
   - src: ome.omero_common
     version: 0.4.0
@@ -24,4 +24,4 @@ roles:
     version: 0.2.0
 
   - src: ome.ice
-    version: 4.4.4
+    version: 4.3.0

From 28e2b5854ed333f693b304273f47f3cd64f8aefc Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Thu, 2 Jan 2025 19:09:22 +0000
Subject: [PATCH 05/22] Change descriptions

---
 .renovaterc.json5 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.renovaterc.json5 b/.renovaterc.json5
index 339717d2..95777078 100644
--- a/.renovaterc.json5
+++ b/.renovaterc.json5
@@ -27,17 +27,17 @@
       versioning: "loose",
     },
     {
-      "description": "RedHat8 support"
+      "description": "RedHat8 support ome.ice"
       "matchPackageNames": ["ome.ice"],
       "allowedVersions": "<=4.3.0"
     },,
     {
-      "description": "RedHat8 support"
+      "description": "RedHat8 support ome.omero_user"
       "matchPackageNames": ["ome.omero_user"],
       "allowedVersions": "<=0.3.1"
     },,
     {
-      "description": "RedHat8 support"
+      "description": "RedHat8 support ome.selinux_utils"
       "matchPackageNames": ["ome.selinux_utils"],
       "allowedVersions": "<=2.0.2"
     },

From f8dded59152543d71c0b147bdd7a6a61ec789c43 Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Thu, 2 Jan 2025 19:10:18 +0000
Subject: [PATCH 06/22] Change links

---
 .github/workflows/links.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/links.yaml b/.github/workflows/links.yaml
index 8245a527..27f2dec1 100644
--- a/.github/workflows/links.yaml
+++ b/.github/workflows/links.yaml
@@ -14,6 +14,7 @@ jobs:
     timeout-minutes: 2
     steps:
       - name: Check links
-        uses: UCL-MIRSG/.github/actions/links@1287e3a2d7a0a513066b1b04d3d2814b44e96ac9 # v0
+        uses: UCL-MIRSG/.github/actions/links@d384ed7e9e3054b3d860907ffb88eb6851f27835 # v0
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          app-id: ${{ secrets.LINK_APP_ID }}
+          app-pem: ${{ secrets.LINK_APP_PEM }}

From 133f0dc23d908978025937df8e04502876cb7717 Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Thu, 2 Jan 2025 19:18:02 +0000
Subject: [PATCH 07/22] Change paths to `.yaml`

---
 .github/workflows/molecule-docker.yaml             | 2 +-
 .github/workflows/molecule-firewalld.yaml          | 2 +-
 .github/workflows/molecule-install-omero.yaml      | 2 +-
 .github/workflows/molecule-install-xnat.yaml       | 2 +-
 .github/workflows/molecule-java.yaml               | 2 +-
 .github/workflows/molecule-monitoring.yaml         | 2 +-
 .github/workflows/molecule-nginx.yaml              | 2 +-
 .github/workflows/molecule-postgresql.yaml         | 2 +-
 .github/workflows/molecule-postgresql_upgrade.yaml | 2 +-
 .github/workflows/molecule-provision.yaml          | 2 +-
 .github/workflows/molecule-provision_accounts.yaml | 2 +-
 .github/workflows/molecule-python.yaml             | 2 +-
 .github/workflows/molecule-tomcat.yaml             | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/molecule-docker.yaml b/.github/workflows/molecule-docker.yaml
index 475801ea..1dd4e6eb 100644
--- a/.github/workflows/molecule-docker.yaml
+++ b/.github/workflows/molecule-docker.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-docker.yml
+      - .github/workflows/molecule-docker.yaml
       - "!**/README.md"
 
 concurrency:
diff --git a/.github/workflows/molecule-firewalld.yaml b/.github/workflows/molecule-firewalld.yaml
index f1074022..938d7b11 100644
--- a/.github/workflows/molecule-firewalld.yaml
+++ b/.github/workflows/molecule-firewalld.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-firewalld.yml
+      - .github/workflows/molecule-firewalld.yaml
       - "!**/README.md"
 
 concurrency:
diff --git a/.github/workflows/molecule-install-omero.yaml b/.github/workflows/molecule-install-omero.yaml
index d7c30e1f..165de05f 100644
--- a/.github/workflows/molecule-install-omero.yaml
+++ b/.github/workflows/molecule-install-omero.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-install-omero.yml
+      - .github/workflows/molecule-install-omero.yaml
       - "!**/README.md"
   release:
     types:
diff --git a/.github/workflows/molecule-install-xnat.yaml b/.github/workflows/molecule-install-xnat.yaml
index a874ed5f..21f0aa7e 100644
--- a/.github/workflows/molecule-install-xnat.yaml
+++ b/.github/workflows/molecule-install-xnat.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-install-xnat.yml
+      - .github/workflows/molecule-install-xnat.yaml
       - "!**/README.md"
   release:
     types:
diff --git a/.github/workflows/molecule-java.yaml b/.github/workflows/molecule-java.yaml
index 40c9832f..3607ec5f 100644
--- a/.github/workflows/molecule-java.yaml
+++ b/.github/workflows/molecule-java.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-java.yml
+      - .github/workflows/molecule-java.yaml
       - "!**/README.md"
 
 concurrency:
diff --git a/.github/workflows/molecule-monitoring.yaml b/.github/workflows/molecule-monitoring.yaml
index fe81c739..c70a5464 100644
--- a/.github/workflows/molecule-monitoring.yaml
+++ b/.github/workflows/molecule-monitoring.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-monitoring.yml
+      - .github/workflows/molecule-monitoring.yaml
       - "!**/README.md"
 
 concurrency:
diff --git a/.github/workflows/molecule-nginx.yaml b/.github/workflows/molecule-nginx.yaml
index 97aec129..04c18c99 100644
--- a/.github/workflows/molecule-nginx.yaml
+++ b/.github/workflows/molecule-nginx.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-nginx.yml
+      - .github/workflows/molecule-nginx.yaml
       - "!**/README.md"
 
 concurrency:
diff --git a/.github/workflows/molecule-postgresql.yaml b/.github/workflows/molecule-postgresql.yaml
index 37ae83f3..8d546d3c 100644
--- a/.github/workflows/molecule-postgresql.yaml
+++ b/.github/workflows/molecule-postgresql.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-postgresql.yml
+      - .github/workflows/molecule-postgresql.yaml
       - "!**/README.md"
 
 concurrency:
diff --git a/.github/workflows/molecule-postgresql_upgrade.yaml b/.github/workflows/molecule-postgresql_upgrade.yaml
index c5df834f..4b7332e1 100644
--- a/.github/workflows/molecule-postgresql_upgrade.yaml
+++ b/.github/workflows/molecule-postgresql_upgrade.yaml
@@ -6,7 +6,7 @@ on:
     paths:
       - molecule_configs/*
       - roles/postgresql_upgrade/**
-      - .github/workflows/molecule-postgresql_upgrade.yml
+      - .github/workflows/molecule-postgresql_upgrade.yaml
       - "!**/README.md"
 
 concurrency:
diff --git a/.github/workflows/molecule-provision.yaml b/.github/workflows/molecule-provision.yaml
index 75fa52ed..d1f67581 100644
--- a/.github/workflows/molecule-provision.yaml
+++ b/.github/workflows/molecule-provision.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-provision.yml
+      - .github/workflows/molecule-provision.yaml
       - "!**/README.md"
 
 concurrency:
diff --git a/.github/workflows/molecule-provision_accounts.yaml b/.github/workflows/molecule-provision_accounts.yaml
index e9417a63..50b581d2 100644
--- a/.github/workflows/molecule-provision_accounts.yaml
+++ b/.github/workflows/molecule-provision_accounts.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - roles/provision_accounts/**
       - playbooks/setup_user_accounts.yml
-      - .github/workflows/molecule-provision_accounts.yml
+      - .github/workflows/molecule-provision_accounts.yaml
       - "!**/README.md"
 
 concurrency:
diff --git a/.github/workflows/molecule-python.yaml b/.github/workflows/molecule-python.yaml
index 50918758..eabc35de 100644
--- a/.github/workflows/molecule-python.yaml
+++ b/.github/workflows/molecule-python.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-python.yml
+      - .github/workflows/molecule-python.yaml
       - "!**/README.md"
 
 concurrency:
diff --git a/.github/workflows/molecule-tomcat.yaml b/.github/workflows/molecule-tomcat.yaml
index ab0a9296..a4f6835a 100644
--- a/.github/workflows/molecule-tomcat.yaml
+++ b/.github/workflows/molecule-tomcat.yaml
@@ -7,7 +7,7 @@ on:
       - molecule_configs/*
       - playbooks/**
       - roles/**
-      - .github/workflows/molecule-tomcat.yml
+      - .github/workflows/molecule-tomcat.yaml
       - "!**/README.md"
 
 concurrency:

From 3e4c0bdfc0a6224b828a05fd77b88c418ee3bdc9 Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Thu, 2 Jan 2025 19:20:12 +0000
Subject: [PATCH 08/22] Change links to `.yaml`

---
 README.md           |  2 +-
 playbooks/README.md |  8 ++++----
 roles/README.md     | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index ae06f3cf..3bb811eb 100644
--- a/README.md
+++ b/README.md
@@ -206,7 +206,7 @@ molecule --base-config ../molecule_configs/centos7_base_config.yml test --scenar
 
 When a PR that modifies a role or playbook is opened, the changes are
 [tested](.github/workflows/) by deploying that role using GitHub Actions. See
-the [`molecule-firewalld` workflow](.github/workflows/molecule-firewalld.yml)
+the [`molecule-firewalld` workflow](.github/workflows/molecule-firewalld.yaml)
 for an example.
 
 ## Code style and formatting
diff --git a/playbooks/README.md b/playbooks/README.md
index 8f9bfcbb..e2847f5c 100644
--- a/playbooks/README.md
+++ b/playbooks/README.md
@@ -67,7 +67,7 @@ paths to these playbooks.
 ### Add a GitHub Workflow
 
 You should add a GitHub workflow for your new playbook to
-`.github/workflows/molecule-my-playbook.yml`. The workflow should follow this
+`.github/workflows/molecule-my-playbook.yaml`. The workflow should follow this
 format:
 
 ```yaml
@@ -76,17 +76,17 @@ on:
   pull_request:
     paths:
       - "playbooks/my_playbook.yml"
-      - ".github/workflows/molecule-role-used-in-playbook.yml"
+      - ".github/workflows/molecule-role-used-in-playbook.yaml"
 
 jobs:
   molecule-my_playbook:
-    uses: ./.github/workflows/molecule.yml
+    uses: ./.github/workflows/molecule.yaml
     with:
       tests-path: ansible_collections/mirsg/infrastructure/playbooks
 ```
 
 This uses the
-[`.github/workflows/molecule.yml` reusable workflow](.github/workflows/molecule.yml)
+[`.github/workflows/molecule.yaml` reusable workflow](.github/workflows/molecule.yaml)
 to run molecule on the relevant role.
 
 ## Playbooks
diff --git a/roles/README.md b/roles/README.md
index 66df56cf..89764683 100644
--- a/roles/README.md
+++ b/roles/README.md
@@ -72,7 +72,7 @@ We have a GitHub workflow for running molecule on each role, and doing so only
 when that role changes.
 
 You should add a GitHub workflow for your new role to
-`.github/workflows/molecule-my-role.yml`. The workflow should follow this
+`.github/workflows/molecule-my-role.yaml`. The workflow should follow this
 format:
 
 ```yaml
@@ -81,16 +81,16 @@ on:
   pull_request:
     paths:
       - "roles/my_role/**"
-      - ".github/workflows/molecule.yml"
-      - ".github/workflows/molecule-my-role.yml"
+      - ".github/workflows/molecule.yaml"
+      - ".github/workflows/molecule-my-role.yaml"
 
 jobs:
   molecule-my_role:
-    uses: ./.github/workflows/molecule.yml
+    uses: ./.github/workflows/molecule.yaml
     with:
       tests-path: ansible_collections/mirsg/infrastructure/roles/my_role
 ```
 
 This uses the
-[`.github/workflows/molecule.yml` reusable workflow](.github/workflows/molecule.yml)
+[`.github/workflows/molecule.yaml` reusable workflow](.github/workflows/molecule.yaml)
 to run molecule on the relevant role.

From ea698df08adff2e828be8a10b314ebbb73bba28e Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Thu, 2 Jan 2025 19:27:27 +0000
Subject: [PATCH 09/22] Fix links

---
 .renovaterc.json5 | 6 +++---
 roles/README.md   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.renovaterc.json5 b/.renovaterc.json5
index 95777078..e67b78cc 100644
--- a/.renovaterc.json5
+++ b/.renovaterc.json5
@@ -29,17 +29,17 @@
     {
       "description": "RedHat8 support ome.ice"
       "matchPackageNames": ["ome.ice"],
-      "allowedVersions": "<=4.3.0"
+      "allowedVersions": "<=4.3.0",
     },,
     {
       "description": "RedHat8 support ome.omero_user"
       "matchPackageNames": ["ome.omero_user"],
-      "allowedVersions": "<=0.3.1"
+      "allowedVersions": "<=0.3.1",
     },,
     {
       "description": "RedHat8 support ome.selinux_utils"
       "matchPackageNames": ["ome.selinux_utils"],
-      "allowedVersions": "<=2.0.2"
+      "allowedVersions": "<=2.0.2",
     },
   ],
   customDatasources: {
diff --git a/roles/README.md b/roles/README.md
index 89764683..da4e2660 100644
--- a/roles/README.md
+++ b/roles/README.md
@@ -86,11 +86,11 @@ on:
 
 jobs:
   molecule-my_role:
-    uses: ./.github/workflows/molecule.yaml
+    uses: UCL-MIRSG/.github/actions/molecule-test@v0
     with:
       tests-path: ansible_collections/mirsg/infrastructure/roles/my_role
 ```
 
 This uses the
-[`.github/workflows/molecule.yaml` reusable workflow](.github/workflows/molecule.yaml)
+[`UCL-MIRSG/.github/actions/molecule-test` composite action](https://github.com/UCL-MIRSG/.github/blob/main/actions/molecule-test/action.yml)
 to run molecule on the relevant role.

From 0b52a9217485f95d5250b1913e912150ded4f8ae Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Thu, 2 Jan 2025 19:31:58 +0000
Subject: [PATCH 10/22] Fix JSON5

---
 .renovaterc.json5   | 6 +++---
 playbooks/README.md | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.renovaterc.json5 b/.renovaterc.json5
index e67b78cc..7079a0b1 100644
--- a/.renovaterc.json5
+++ b/.renovaterc.json5
@@ -27,17 +27,17 @@
       versioning: "loose",
     },
     {
-      "description": "RedHat8 support ome.ice"
+      "description": "RedHat8 support ome.ice",
       "matchPackageNames": ["ome.ice"],
       "allowedVersions": "<=4.3.0",
     },,
     {
-      "description": "RedHat8 support ome.omero_user"
+      "description": "RedHat8 support ome.omero_user",
       "matchPackageNames": ["ome.omero_user"],
       "allowedVersions": "<=0.3.1",
     },,
     {
-      "description": "RedHat8 support ome.selinux_utils"
+      "description": "RedHat8 support ome.selinux_utils",
       "matchPackageNames": ["ome.selinux_utils"],
       "allowedVersions": "<=2.0.2",
     },
diff --git a/playbooks/README.md b/playbooks/README.md
index e2847f5c..ee58f02a 100644
--- a/playbooks/README.md
+++ b/playbooks/README.md
@@ -80,13 +80,13 @@ on:
 
 jobs:
   molecule-my_playbook:
-    uses: ./.github/workflows/molecule.yaml
+    uses: UCL-MIRSG/.github/actions/molecule-test@v0
     with:
       tests-path: ansible_collections/mirsg/infrastructure/playbooks
 ```
 
 This uses the
-[`.github/workflows/molecule.yaml` reusable workflow](.github/workflows/molecule.yaml)
+[`UCL-MIRSG/.github/actions/molecule-test` composite action](https://github.com/UCL-MIRSG/.github/blob/main/actions/molecule-test/action.yml)
 to run molecule on the relevant role.
 
 ## Playbooks

From 25502d4fe8b5456ca915cb36f6dd18f06ef53890 Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Thu, 2 Jan 2025 19:33:38 +0000
Subject: [PATCH 11/22] Fix linting

---
 .renovaterc.json5 | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.renovaterc.json5 b/.renovaterc.json5
index 7079a0b1..fc83d80b 100644
--- a/.renovaterc.json5
+++ b/.renovaterc.json5
@@ -27,19 +27,21 @@
       versioning: "loose",
     },
     {
-      "description": "RedHat8 support ome.ice",
-      "matchPackageNames": ["ome.ice"],
-      "allowedVersions": "<=4.3.0",
-    },,
-    {
-      "description": "RedHat8 support ome.omero_user",
-      "matchPackageNames": ["ome.omero_user"],
-      "allowedVersions": "<=0.3.1",
-    },,
-    {
-      "description": "RedHat8 support ome.selinux_utils",
-      "matchPackageNames": ["ome.selinux_utils"],
-      "allowedVersions": "<=2.0.2",
+      description: "RedHat8 support ome.ice",
+      matchPackageNames: ["ome.ice"],
+      allowedVersions: "<=4.3.0",
+    },
+    ,
+    {
+      description: "RedHat8 support ome.omero_user",
+      matchPackageNames: ["ome.omero_user"],
+      allowedVersions: "<=0.3.1",
+    },
+    ,
+    {
+      description: "RedHat8 support ome.selinux_utils",
+      matchPackageNames: ["ome.selinux_utils"],
+      allowedVersions: "<=2.0.2",
     },
   ],
   customDatasources: {

From 4744d1a3cc4bc8b1898e88c7f0ccfababc5cf2bb Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Thu, 2 Jan 2025 19:38:32 +0000
Subject: [PATCH 12/22] Fix linting

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3bb811eb..cddf5264 100644
--- a/README.md
+++ b/README.md
@@ -46,15 +46,14 @@ example, for upgrading the postgresql version on the `ucl_test` server:
 ansible-playbook mirsg.infrastructure.upgrade_postgresql -u <user> --ask-become-pass -l ucl_test -i environments/cs-production/xnat/hosts.yml --vault-password-file ~/.ucl_xnat-vault_password
 ```
 
-The
-[upgrade_postgresql.yml](https://github.com/UCL-MIRSG/ansible-collection-infra/blob/f2574a6d6d7e5682e8507373643722916c5461bc/playbooks/upgrade_postgresql.yml)
-playbook prompts for the version to upgrade from and to upgrade to.
+The [upgrade_postgresql.yml](./playbooks/upgrade_postgresql.yml) playbook
+prompts for the version to upgrade from and to upgrade to.
 
 The following variable needs to be set:
 `postgresql_upgrade_data_dir: “/var/lib/pgsql/{{ postgreql_upgrade_new_version }}/data”`
 
 This is done in the group vars for the server you're updating i.e.
-[ucl_test](https://github.com/UCL-MIRSG/UCLMedicalImagingEnv/blob/ef69a7116dcacbc30a146a5d06c928d686805dd5/environments/cs-production/xnat/group_vars/ucl_test/vars)
+[ucl_test](https://github.com/UCL-MIRSG/UCLMedicalImagingEnv/blob/main/environments/cs-production/xnat/group_vars/ucl_test/vars)
 
 ## Testing this collection
 

From 86c2ecc037c9aca26a385b5288ce1623c331387c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Jan 2025 19:41:35 +0000
Subject: [PATCH 13/22] Renovate: nginx Docker digest to 42e917a (#157)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 roles/monitoring_server/tasks/install_nginx_container.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/monitoring_server/tasks/install_nginx_container.yml b/roles/monitoring_server/tasks/install_nginx_container.yml
index 7c77d562..57b86704 100644
--- a/roles/monitoring_server/tasks/install_nginx_container.yml
+++ b/roles/monitoring_server/tasks/install_nginx_container.yml
@@ -72,7 +72,7 @@
   community.docker.docker_container:
     name: nginx
     hostname: nginx
-    image: nginx@sha256:fb197595ebe76b9c0c14ab68159fd3c08bd067ec62300583543f0ebda353b5be
+    image: nginx@sha256:42e917aaa1b5bb40dd0f6f7f4f857490ac7747d7ef73b391c774a41a8b994f15
     state: started
     networks:
       - name: monitor-net

From 4bc95462f62d0b6382ab1f68c5b6e25ee1978457 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 2 Jan 2025 19:42:33 +0000
Subject: [PATCH 14/22] Renovate: UCL-MIRSG/.github to 058474b (#160)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Patrick J. Roddy <patrickjamesroddy@gmail.com>
---
 .github/workflows/links.yaml   | 2 +-
 .github/workflows/linting.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/links.yaml b/.github/workflows/links.yaml
index 27f2dec1..7a19896c 100644
--- a/.github/workflows/links.yaml
+++ b/.github/workflows/links.yaml
@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 2
     steps:
       - name: Check links
-        uses: UCL-MIRSG/.github/actions/links@d384ed7e9e3054b3d860907ffb88eb6851f27835 # v0
+        uses: UCL-MIRSG/.github/actions/links@058474bb0eeb6f67f8f33672d9dcbdfcb44b6584 # v0
         with:
           app-id: ${{ secrets.LINK_APP_ID }}
           app-pem: ${{ secrets.LINK_APP_PEM }}
diff --git a/.github/workflows/linting.yaml b/.github/workflows/linting.yaml
index 100ccbd2..67c14600 100644
--- a/.github/workflows/linting.yaml
+++ b/.github/workflows/linting.yaml
@@ -12,7 +12,7 @@ jobs:
   linting:
     runs-on: ubuntu-latest
     steps:
-      - uses: UCL-MIRSG/.github/actions/linting@1287e3a2d7a0a513066b1b04d3d2814b44e96ac9 # v0
+      - uses: UCL-MIRSG/.github/actions/linting@058474bb0eeb6f67f8f33672d9dcbdfcb44b6584 # v0
         with:
           ansible-roles-config: ./meta/requirements.yml
           pre-commit-config: ./.pre-commit-config.yaml

From c1da5f8818031f0543f3146ad031559b749b01de Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Fri, 3 Jan 2025 10:33:43 +0000
Subject: [PATCH 15/22] Switch from `blob` to `tree`

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cddf5264..4ed9a04c 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ The following variable needs to be set:
 `postgresql_upgrade_data_dir: “/var/lib/pgsql/{{ postgreql_upgrade_new_version }}/data”`
 
 This is done in the group vars for the server you're updating i.e.
-[ucl_test](https://github.com/UCL-MIRSG/UCLMedicalImagingEnv/blob/main/environments/cs-production/xnat/group_vars/ucl_test/vars)
+[ucl_test](https://github.com/UCL-MIRSG/UCLMedicalImagingEnv/tree/main/environments/cs-production/xnat/group_vars/ucl_test)
 
 ## Testing this collection
 

From 1a61fc5a4eab5c67b1902d8a2820a9f48d71bb33 Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Fri, 3 Jan 2025 10:39:36 +0000
Subject: [PATCH 16/22] Update SHA

---
 .github/workflows/links.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/links.yaml b/.github/workflows/links.yaml
index 7a19896c..70d8c477 100644
--- a/.github/workflows/links.yaml
+++ b/.github/workflows/links.yaml
@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 2
     steps:
       - name: Check links
-        uses: UCL-MIRSG/.github/actions/links@058474bb0eeb6f67f8f33672d9dcbdfcb44b6584 # v0
+        uses: UCL-MIRSG/.github/actions/links@865bfed74ba5963cb7fdc16383a86e73f250303e # v0
         with:
           app-id: ${{ secrets.LINK_APP_ID }}
           app-pem: ${{ secrets.LINK_APP_PEM }}

From 170fd968fa9ff2e1143b8081a759627e48a2c677 Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Fri, 3 Jan 2025 10:44:57 +0000
Subject: [PATCH 17/22] Update SHA

---
 .github/workflows/links.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/links.yaml b/.github/workflows/links.yaml
index 70d8c477..3fad178e 100644
--- a/.github/workflows/links.yaml
+++ b/.github/workflows/links.yaml
@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 2
     steps:
       - name: Check links
-        uses: UCL-MIRSG/.github/actions/links@865bfed74ba5963cb7fdc16383a86e73f250303e # v0
+        uses: UCL-MIRSG/.github/actions/links@feed2f417cdc1508d1a9eb3cb6e99c84f2a4b154 # v0
         with:
           app-id: ${{ secrets.LINK_APP_ID }}
           app-pem: ${{ secrets.LINK_APP_PEM }}

From 2de5c9091056e2f7f1a8dea0ee1c9bb15f9728f2 Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Fri, 3 Jan 2025 10:48:10 +0000
Subject: [PATCH 18/22] Try raw

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4ed9a04c..c1103a47 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ The following variable needs to be set:
 `postgresql_upgrade_data_dir: “/var/lib/pgsql/{{ postgreql_upgrade_new_version }}/data”`
 
 This is done in the group vars for the server you're updating i.e.
-[ucl_test](https://github.com/UCL-MIRSG/UCLMedicalImagingEnv/tree/main/environments/cs-production/xnat/group_vars/ucl_test)
+[ucl_test](https://raw.githubusercontent.com/UCL-MIRSG/UCLMedicalImagingEnv/refs/heads/main/environments/cs-production/xnat/group_vars/ucl_test/vars)
 
 ## Testing this collection
 

From 894dd93717765e2209803d1c01c8aeeb0ee65a0f Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Fri, 3 Jan 2025 10:55:15 +0000
Subject: [PATCH 19/22] curl

---
 .github/workflows/links.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/links.yaml b/.github/workflows/links.yaml
index 3fad178e..2f0c8a94 100644
--- a/.github/workflows/links.yaml
+++ b/.github/workflows/links.yaml
@@ -18,3 +18,16 @@ jobs:
         with:
           app-id: ${{ secrets.LINK_APP_ID }}
           app-pem: ${{ secrets.LINK_APP_PEM }}
+
+      - name: Generate token
+        if: always()
+        id: generate-token
+        uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1
+        with:
+          app-id: ${{ secrets.LINK_APP_ID }}
+          private-key: ${{ secrets.LINK_APP_PEM }}
+
+      - name: Test access
+        run: |-
+            curl -H "Authorization: Bearer ${{ steps.generate-token.outputs.token }}" \
+            https://api.github.com/repos/UCL-MIRSG/UCLMedicalImagingEnv/contents/environments/cs-production/xnat/group_vars/ucl_test

From 7cb466320b10ce69d6ca2301dd0c9fc6c7a74bfb Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Fri, 3 Jan 2025 10:55:56 +0000
Subject: [PATCH 20/22] Always

---
 .github/workflows/links.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/links.yaml b/.github/workflows/links.yaml
index 2f0c8a94..7346aa1e 100644
--- a/.github/workflows/links.yaml
+++ b/.github/workflows/links.yaml
@@ -28,6 +28,7 @@ jobs:
           private-key: ${{ secrets.LINK_APP_PEM }}
 
       - name: Test access
+        if: always()
         run: |-
             curl -H "Authorization: Bearer ${{ steps.generate-token.outputs.token }}" \
             https://api.github.com/repos/UCL-MIRSG/UCLMedicalImagingEnv/contents/environments/cs-production/xnat/group_vars/ucl_test

From e441ac5e1e1efdfeac031a885cd0873afadfbdd1 Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Fri, 3 Jan 2025 16:27:48 +0000
Subject: [PATCH 21/22] Update links

---
 .github/workflows/links.yaml | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/links.yaml b/.github/workflows/links.yaml
index 7346aa1e..7f624da8 100644
--- a/.github/workflows/links.yaml
+++ b/.github/workflows/links.yaml
@@ -14,21 +14,7 @@ jobs:
     timeout-minutes: 2
     steps:
       - name: Check links
-        uses: UCL-MIRSG/.github/actions/links@feed2f417cdc1508d1a9eb3cb6e99c84f2a4b154 # v0
+        uses: UCL-MIRSG/.github/actions/links@a7534b4183ae58f24714fe8633c4433365131257 # v0
         with:
-          app-id: ${{ secrets.LINK_APP_ID }}
-          app-pem: ${{ secrets.LINK_APP_PEM }}
-
-      - name: Generate token
-        if: always()
-        id: generate-token
-        uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1
-        with:
-          app-id: ${{ secrets.LINK_APP_ID }}
-          private-key: ${{ secrets.LINK_APP_PEM }}
-
-      - name: Test access
-        if: always()
-        run: |-
-            curl -H "Authorization: Bearer ${{ steps.generate-token.outputs.token }}" \
-            https://api.github.com/repos/UCL-MIRSG/UCLMedicalImagingEnv/contents/environments/cs-production/xnat/group_vars/ucl_test
+          app-id: ${{ vars.LINKS_APP_ID }}
+          app-pem: ${{ secrets.LINKS_PRIVATE_KEY }}

From 41795ac0624083a017a1337ce82b45827207ff2f Mon Sep 17 00:00:00 2001
From: "Patrick J. Roddy" <patrickjamesroddy@gmail.com>
Date: Fri, 3 Jan 2025 16:29:17 +0000
Subject: [PATCH 22/22] Change back to blob

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c1103a47..cddf5264 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ The following variable needs to be set:
 `postgresql_upgrade_data_dir: “/var/lib/pgsql/{{ postgreql_upgrade_new_version }}/data”`
 
 This is done in the group vars for the server you're updating i.e.
-[ucl_test](https://raw.githubusercontent.com/UCL-MIRSG/UCLMedicalImagingEnv/refs/heads/main/environments/cs-production/xnat/group_vars/ucl_test/vars)
+[ucl_test](https://github.com/UCL-MIRSG/UCLMedicalImagingEnv/blob/main/environments/cs-production/xnat/group_vars/ucl_test/vars)
 
 ## Testing this collection