From 89a9772227e047ea09a66af545d87679034d5bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Besson?= <sbesson@glencoesoftware.com>
Date: Fri, 5 Jul 2024 12:02:10 +0100
Subject: [PATCH] Update IceGrid templates to make the OMERO.tables module
 configurable

Add a new top-level TABLES_MODULE variable used by the Tables template
to start the new server.
Functionally, this will need to be tested alongside a corresponding
OMERO.py with the logic to replace @omero.tables.module@ by either the
value of the omero.tables.module configuration or the default runTables
value.
---
 etc/omero.properties             | 4 +++-
 etc/templates/grid/default.xml   | 1 +
 etc/templates/grid/templates.xml | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/etc/omero.properties b/etc/omero.properties
index fbca6d38c94..9596b5a1781 100644
--- a/etc/omero.properties
+++ b/etc/omero.properties
@@ -168,7 +168,9 @@ omero.server.nodedescriptors=
 #############################################
 _omero.glacier2.IceSSL.Ciphers.darwin=(AES)
 
-
+## (For documentation only)
+# Name of the Python module to use when starting the Tables service
+omero.tables.module=runTables
 
 #############################################
 ## Server product name for release artifacts
diff --git a/etc/templates/grid/default.xml b/etc/templates/grid/default.xml
index b70601c3769..37aa66bfbe8 100644
--- a/etc/templates/grid/default.xml
+++ b/etc/templates/grid/default.xml
@@ -21,6 +21,7 @@
     <variable name="ROUTERPORT"    value="@omero.ports.prefix@@omero.ports.ssl@"/>
     <variable name="INSECUREROUTER" value="OMERO.Glacier2/router:tcp -p @omero.ports.prefix@@omero.ports.tcp@ -h @omero.host@"/>
     <variable name="SEP"           value=":"/>
+    <variable name="TABLES_MODULE" value="@omero.tables.module@"/>
 
     <properties id="Profile">
       <!--
diff --git a/etc/templates/grid/templates.xml b/etc/templates/grid/templates.xml
index 25609bda044..03d9bb45273 100644
--- a/etc/templates/grid/templates.xml
+++ b/etc/templates/grid/templates.xml
@@ -350,7 +350,7 @@
       <parameter name="exe" default="${PYTHON}"/>
       <server id="Tables-${index}" exe="${exe}" activation="always" pwd="${OMERO_HOME}">
         <option>-m</option>
-        <option>runTables</option>
+        <option>${TABLES_MODULE}</option>
         <adapter name="TablesAdapter" endpoints="tcp">
           <object identity="Tables-${index}" type="::omero::grid::Tables"/>
         </adapter>