From c7f2c9f7a4aa872c310b46e1ab27474c1058f4df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Fri, 5 Jul 2024 11:09:00 +0100 Subject: [PATCH 1/2] admin rewrite: make OMERO.tables module configurable Add @omero.tables.module@ to the list of templates to be substituted in the server IceGrid XML templates and replaces it with the value. of `omero.tables.module` in the OMERO configuration, using `runTables` as the default. This change should be a no-op when used with OMERO.server binaries up to 5.6.11 but will be mandatory once the templates are updated to use the new substitution field. --- src/omero/plugins/admin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/omero/plugins/admin.py b/src/omero/plugins/admin.py index 5f1cf36d7..0b3058c0e 100755 --- a/src/omero/plugins/admin.py +++ b/src/omero/plugins/admin.py @@ -1198,7 +1198,9 @@ def clear_tail(elem): '@omero.ports.registry@': config.get( 'omero.ports.registry', '4061'), '@omero.master.host@': config.get('omero.master.host', config.get( - 'Ice.Default.Host', '127.0.0.1')) + 'Ice.Default.Host', '127.0.0.1')), + "@omero.tables.module@": config.get( + "omero.tables.module", "runTables") } client_transports = config.get('omero.client.icetransports', 'ssl,tcp') From 0d8fc4a09633f95a23df828c084e2ddbd0c6c454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Thu, 11 Jul 2024 14:29:57 +0100 Subject: [PATCH 2/2] Parse omero.tables properties under new Tables header --- src/omero/install/config_parser.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/omero/install/config_parser.py b/src/omero/install/config_parser.py index 750ce5035..9d7830cc7 100755 --- a/src/omero/install/config_parser.py +++ b/src/omero/install/config_parser.py @@ -48,6 +48,7 @@ def get_reference(self): PERFORMANCE_HEADER = Header("Performance", reference="performance") SCRIPTS_HEADER = Header("Scripts", reference="scripts") SECURITY_HEADER = Header("Security", reference="security") +TABLES_HEADER = Header("Tables", reference="tables") HEADER_MAPPING = { "omero.data": FS_HEADER, @@ -66,6 +67,7 @@ def get_reference(self): "omero.process": SCRIPTS_HEADER, "omero.scripts": SCRIPTS_HEADER, "omero.security": SECURITY_HEADER, + "omero.tables": TABLES_HEADER, "omero.resetpassword": SECURITY_HEADER, "omero.upgrades": MISC_HEADER, "Ice": ICE_HEADER,