From 971c7828ff7aa0b9a0a39217a07cb97ecadc83ab Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Fri, 2 Aug 2024 13:33:24 +0200
Subject: [PATCH] Move the ulimit settings inside the systemd unit.

---
 templates/tomcat-default.j2 | 2 ++
 templates/tomcat-service.j2 | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/templates/tomcat-default.j2 b/templates/tomcat-default.j2
index 54afff1..863782d 100644
--- a/templates/tomcat-default.j2
+++ b/templates/tomcat-default.j2
@@ -1,7 +1,9 @@
+{% if tomcat_use_systemd %}
 {% if limits_nofile_value is defined %}
 ulimit -Hn {{ limits_nofile_value }}
 ulimit -Sn {{ limits_nofile_value }}
 {% endif %}
+{% endif %}
 TOMCAT_USER={{ item.user }}
 TOMCAT_GROUP={{ item.user }}
 JAVA_HOME={{ item.java_home }}
diff --git a/templates/tomcat-service.j2 b/templates/tomcat-service.j2
index 4b72479..2427738 100644
--- a/templates/tomcat-service.j2
+++ b/templates/tomcat-service.j2
@@ -10,6 +10,9 @@ StartLimitBurst=5
 RequiresMountsFor={{ tomcat_m_instances_logdir_base }}/{{ item.http_port }} {{ item.instance_path }}
 
 [Service]
+{% if limits_nofile_value is defined %}
+LimitNOFILE={{ limits_nofile_value }}
+{% endif %}
 Environment="CATALINA_HOME=/usr/share/tomcat{{ tomcat_version }}"
 Environment="CATALINA_BASE={{ item.instance_path }}"
 Environment="CATALINA_TMPDIR={{ item.catalina_tmp_directory }}"