Merge branch 'main' into fix/tomcat-rocky-9

.renovaterc.json

@@ -49,7 +49,7 @@
       "matchStrings": ["xnat_version:\\s?(?<currentValue>.*?)\\n"],
       "depNameTemplate": "xnatdev/xnat-web",
       "datasourceTemplate": "bitbucket-tags",
-      "versioningTemplate": "regex:(?<major>\\d+).(?<minor>\\d+).(?<build>\\d+).(?<revision>\\d+)"
+      "versioning": "loose"
     },
     {
       "customType": "regex",
@@ -130,7 +130,7 @@
       "matchStrings": ["dxm-settings-plugin-(?<currentValue>.*?).jar"],
       "depNameTemplate": "xnatx/xnatx-dxm-settings-plugin",
       "datasourceTemplate": "bitbucket-tags",
-      "versioningTemplate": "regex:(?<major>\\d+).(?<minor>\\d+)"
+      "versioning": "loose"
     },
     {
       "customType": "regex",

playbooks/molecule/resources/monitoring/inventory/hosts.yml

@@ -5,12 +5,10 @@ all:
     mclient:
       hostname: molecule.mclient.local
       ansible_ip: 192.168.56.2
-      ansible_port: 22
 
     mserv:
       hostname: molecule.mserv.local
       ansible_ip: 192.168.56.3
-      ansible_port: 22
 
   # Ansible groups. Groups allow configuration and variables to be shared between hosts
   # Variables in group_vars/all will be shared between all hosts

playbooks/molecule/resources/xnat/inventory/hosts.yml

@@ -6,17 +6,16 @@ all:
     xnat_db:
       hostname: "xnat.db.local"
       ansible_ip: "192.168.56.2"
-      ansible_port: 22
+
     # Host for your web server. Variables in host_vars/xnat_web will be available to this host
     xnat_web:
       hostname: "localhost" # necessary to allow redirects outside the Docker network and to avoid CORS issues inside the network
       ansible_ip: "192.168.56.3"
-      ansible_port: 22
+
     # Host for running the container service. Variables in host_vars/xnat_cserv will be available to this host
     xnat_cserv:
       hostname: "xnat.cserv.local"
       ansible_ip: "192.168.56.4"
-      ansible_port: 22
 
   # Ansible groups. Groups allow configuration and variables to be shared between hosts
   # Variables in group_vars/all will be shared between all hosts

roles/xnat/tasks/settings_files.yml

@@ -9,6 +9,15 @@
     force: true
   notify: Restart tomcat
 
+- name: "Validate xnat_config.site_name: {{ xnat_config.site_name }}"
+  ansible.builtin.assert:
+    that:
+      - xnat_config.site_name is match('^[A-Za-z][A-Za-z0-9_]*$')
+    fail_msg: >
+      xnat_config.site_name must start with a letter and contain only
+      letters, numbers, and underscores
+    success_msg: xnat_config.site_name is valid
+
 - name: "Configure prefs-init"
   ansible.builtin.template:
     src: "prefs-init.j2"