From 5973330dc4c07072210efbf8052d478834e83ff0 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste VESLIN <19856429+thebaptiste@users.noreply.github.com>
Date: Mon, 26 Jun 2023 14:16:26 +0200
Subject: [PATCH 1/2] feat: mfadmin crontab : keep kibana web interface and ES
 config (#1600)

Close: https://github.com/metwork-framework/mfadmin/issues/260
(cherry picked from commit 5e87bdc006217c2fc6ae112113afaa4db3ee8302)
---
 adm/templates/crontab | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/adm/templates/crontab b/adm/templates/crontab
index eec307cd..3e755f2a 100644
--- a/adm/templates/crontab
+++ b/adm/templates/crontab
@@ -8,9 +8,14 @@
 {% set misc_tmp_max_age = misc_tmp_max_age_env|getenv("0")|int %}
 {% if misc_tmp_max_age > 0 %}
 # Cleaning of tmp subdirectory
+{% if MFMODULE == "MFADMIN" %}
+0 2 * * * {{MFMODULE_HOME}}/bin/cronwrap.sh --lock --timeout=3600 --log-capture-to=NULL -- 'find {{MFMODULE_RUNTIME_HOME}}/tmp -type f -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/config_auto/*" -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/kibana/*" -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/elasticsearch/config/*" -mtime +{{misc_tmp_max_age}} -delete'
+30 2 * * * {{MFMODULE_HOME}}/bin/cronwrap.sh --lock --timeout=3600 --log-capture-to=NULL -- 'find {{MFMODULE_RUNTIME_HOME}}/tmp -type d -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/config_auto" --not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/kibana/*" -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/elasticsearch/config/" -mtime +{{misc_tmp_max_age}} -exec rmdir {} \;'
+{% else %}
 0 2 * * * {{MFMODULE_HOME}}/bin/cronwrap.sh --lock --timeout=3600 --log-capture-to=NULL -- 'find {{MFMODULE_RUNTIME_HOME}}/tmp -type f -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/config_auto/*" -mtime +{{misc_tmp_max_age}} -delete'
 30 2 * * * {{MFMODULE_HOME}}/bin/cronwrap.sh --lock --timeout=3600 --log-capture-to=NULL -- 'find {{MFMODULE_RUNTIME_HOME}}/tmp -type d -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/config_auto" -mtime +{{misc_tmp_max_age}} -exec rmdir {} \;'
 {% endif %}
+{% endif %}
 {% endraw %}
 
 {% block custom %}

From e48623962e08f228110fc4e5813d54c4a91a3c4e Mon Sep 17 00:00:00 2001
From: Jean-Baptiste VESLIN <19856429+thebaptiste@users.noreply.github.com>
Date: Thu, 29 Jun 2023 22:21:04 +0200
Subject: [PATCH 2/2] build: fix crontab

---
 adm/templates/crontab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adm/templates/crontab b/adm/templates/crontab
index 3e755f2a..48e1e2ec 100644
--- a/adm/templates/crontab
+++ b/adm/templates/crontab
@@ -10,7 +10,7 @@
 # Cleaning of tmp subdirectory
 {% if MFMODULE == "MFADMIN" %}
 0 2 * * * {{MFMODULE_HOME}}/bin/cronwrap.sh --lock --timeout=3600 --log-capture-to=NULL -- 'find {{MFMODULE_RUNTIME_HOME}}/tmp -type f -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/config_auto/*" -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/kibana/*" -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/elasticsearch/config/*" -mtime +{{misc_tmp_max_age}} -delete'
-30 2 * * * {{MFMODULE_HOME}}/bin/cronwrap.sh --lock --timeout=3600 --log-capture-to=NULL -- 'find {{MFMODULE_RUNTIME_HOME}}/tmp -type d -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/config_auto" --not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/kibana/*" -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/elasticsearch/config/" -mtime +{{misc_tmp_max_age}} -exec rmdir {} \;'
+30 2 * * * {{MFMODULE_HOME}}/bin/cronwrap.sh --lock --timeout=3600 --log-capture-to=NULL -- 'find {{MFMODULE_RUNTIME_HOME}}/tmp -type d -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/config_auto" -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/kibana/*" -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/elasticsearch/config/" -mtime +{{misc_tmp_max_age}} -exec rmdir {} \;'
 {% else %}
 0 2 * * * {{MFMODULE_HOME}}/bin/cronwrap.sh --lock --timeout=3600 --log-capture-to=NULL -- 'find {{MFMODULE_RUNTIME_HOME}}/tmp -type f -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/config_auto/*" -mtime +{{misc_tmp_max_age}} -delete'
 30 2 * * * {{MFMODULE_HOME}}/bin/cronwrap.sh --lock --timeout=3600 --log-capture-to=NULL -- 'find {{MFMODULE_RUNTIME_HOME}}/tmp -type d -not -path "{{MFMODULE_RUNTIME_HOME}}/tmp/config_auto" -mtime +{{misc_tmp_max_age}} -exec rmdir {} \;'