From c3c06e0819e685ad455c1d90d579d02fdd8a0884 Mon Sep 17 00:00:00 2001 From: Yana Date: Wed, 15 Apr 2026 12:19:22 +0300 Subject: [PATCH 1/3] Support installed tomcat version --- yodeploy/hooks/tomcat.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yodeploy/hooks/tomcat.py b/yodeploy/hooks/tomcat.py index 2280fec..f810dec 100644 --- a/yodeploy/hooks/tomcat.py +++ b/yodeploy/hooks/tomcat.py @@ -6,6 +6,7 @@ import sys import time import distro +from pathlib import Path from yodeploy.hooks.configurator import ConfiguratedApp @@ -93,7 +94,8 @@ def tomcat_deploy(self): dest = os.path.join(contexts, 'ROOT##%s' % version) ubuntu_version = distro.version() - tomcat = 'tomcat10' if ubuntu_version >= '24.04' else 'tomcat9' + tomcat_dir = next(Path('/etc').glob('tomcat*'), None) + tomcat = tomcat_dir.name uid = pwd.getpwnam(tomcat).pw_uid os.chown(contexts, uid, -1) From c3fdfd56f33244d2e2b0864b6be9e623f9ae0f3f Mon Sep 17 00:00:00 2001 From: Yana Date: Thu, 16 Apr 2026 16:48:21 +0300 Subject: [PATCH 2/3] Do not hardcode Tomcat versions --- CHANGELOG.md | 4 ++++ yodeploy/__init__.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79c4fad..8fadbc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Change Log ========== +2.1.1 +----- +* Support installed Tomcat version + 2.1.0 ----- * Support Tomcat 10 diff --git a/yodeploy/__init__.py b/yodeploy/__init__.py index a33997d..55fa725 100644 --- a/yodeploy/__init__.py +++ b/yodeploy/__init__.py @@ -1 +1 @@ -__version__ = '2.1.0' +__version__ = '2.1.1' From dc8e3e86d09a0654cad4f5b6fa0e4e55ba5ee81a Mon Sep 17 00:00:00 2001 From: Yana Date: Wed, 22 Apr 2026 19:43:40 +0300 Subject: [PATCH 3/3] Proceed with tomcat9 on ubuntu24 --- yodeploy/hooks/tomcat.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/yodeploy/hooks/tomcat.py b/yodeploy/hooks/tomcat.py index f810dec..dd988b5 100644 --- a/yodeploy/hooks/tomcat.py +++ b/yodeploy/hooks/tomcat.py @@ -6,7 +6,6 @@ import sys import time import distro -from pathlib import Path from yodeploy.hooks.configurator import ConfiguratedApp @@ -94,8 +93,7 @@ def tomcat_deploy(self): dest = os.path.join(contexts, 'ROOT##%s' % version) ubuntu_version = distro.version() - tomcat_dir = next(Path('/etc').glob('tomcat*'), None) - tomcat = tomcat_dir.name + tomcat = 'tomcat9' if ubuntu_version >= '20.04' else 'tomcat8' uid = pwd.getpwnam(tomcat).pw_uid os.chown(contexts, uid, -1)