From 8b7d8676fdb7d37c70cbeab4b678a5432da00287 Mon Sep 17 00:00:00 2001
From: Mathieu Trossevin <mtrossevin+git@evolix.fr>
Date: Tue, 20 Oct 2020 14:15:38 +0200
Subject: [PATCH 1/2] Add possibility to change ulimit for Apache

cf. https://wiki.evolix.org/HowtoApache#too-many-open-files
---
 apache/defaults/main.yml |  4 ++++
 apache/tasks/main.yml    | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/apache/defaults/main.yml b/apache/defaults/main.yml
index 15ff1a53..dab98450 100644
--- a/apache/defaults/main.yml
+++ b/apache/defaults/main.yml
@@ -14,6 +14,10 @@ apache_evolinux_default_ssl_key: /etc/ssl/private/ssl-cert-snakeoil.key
 apache_serverstatus_suffix: ""
 apache_serverstatus_suffix_file: "/etc/evolinux/apache_serverstatus_suffix"
 
+# Change Apache's ulimit through APACHE_ULIMIT_MAX_FILES
+apache_change_ulimit: True
+apache_ulimit_max: '65536'
+
 apache_log2mail_include: True
 apache_munin_include: True
 
diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml
index b7611cac..1c61932b 100644
--- a/apache/tasks/main.yml
+++ b/apache/tasks/main.yml
@@ -137,6 +137,16 @@
   tags:
     - apache
 
+- name: Add line in envvars for ulimit
+  lineinfile:
+    path: /etc/apache2/envvars
+    regexp: '^#?APACHE_ULIMIT_MAX_FILES='
+    line: "APACHE_ULIMIT_MAX_FILES='ulimit -n {{ apache_ulimit_max }}'"
+  when: apache_change_ulimit
+  notify: 'restart apache'
+  tags:
+    - apache
+
 - include_role:
     name: evolix/remount-usr
   tags:
-- 
2.39.2


From cf67cfbc2c8697eac06d46ed3dd4dca28f7c9ba2 Mon Sep 17 00:00:00 2001
From: Mathieu Trossevin <mtrossevin+git@evolix.fr>
Date: Tue, 20 Oct 2020 17:16:38 +0200
Subject: [PATCH 2/2] Update changelog: Add possibility to change Apache's
 ulimit

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07f1e37f..108c08e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ The **patch** part changes incrementally at each release.
 * dovecot: Update munin plugin & configure it
 * nextcloud: New role to setup a nextcloud instance
 * redis: variable to force use of port 6379 in instances mode
+* apache: Add possibility to change ulimit for Apache
 
 ### Changed
 
-- 
2.39.2