From ae722678a1b51b525863b7a2d8e6a936e8dc7f31 Mon Sep 17 00:00:00 2001
From: Lisa Casino <lisa.casino@nexedi.com>
Date: Wed, 23 Jun 2021 17:16:08 +0200
Subject: [PATCH] software/html5as-base: add logrotate

---
 software/html5as-base/buildout.hash.cfg       |  2 +-
 software/html5as-base/instance_html5as.cfg.in | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/software/html5as-base/buildout.hash.cfg b/software/html5as-base/buildout.hash.cfg
index 58aef49dfc..a7bae89e04 100644
--- a/software/html5as-base/buildout.hash.cfg
+++ b/software/html5as-base/buildout.hash.cfg
@@ -21,7 +21,7 @@ md5sum = d52a24adf6a4cb1c514b657c63ebf7a5
 
 [instance_html5as]
 _update_hash_filename_ = instance_html5as.cfg.in
-md5sum = 5d6965e14c72f6500ab37acd2a28aa7e
+md5sum = fa41f96ffad93ef07881a37ee34928b6
 
 [template_nginx_conf]
 _update_hash_filename_ = templates/nginx_conf.in
diff --git a/software/html5as-base/instance_html5as.cfg.in b/software/html5as-base/instance_html5as.cfg.in
index abde503054..8e6cef9216 100644
--- a/software/html5as-base/instance_html5as.cfg.in
+++ b/software/html5as-base/instance_html5as.cfg.in
@@ -15,6 +15,7 @@ parts =
     launcher
     nginx-graceful
     port-listening-promise
+    logrotate-entry-nginx
     publish-connection-information
 
 # Define egg directories to be the one from Software Release
@@ -181,6 +182,15 @@ config-port = ${html5as:port}
 [monitor-instance-parameter]
 monitor-httpd-port = {{ parameter_dict['monitor-httpd-port'] }}
 
+# Monitor Stack also provides logrotate stack. We only need to extend
+# the logrotate-entry-base defined in instance-logrotate-base.cfg.in .
+# More parameters can be added following the logrotate-entry-base section
+[logrotate-entry-nginx]
+<= logrotate-entry-base
+name = nginx
+log = ${html5as:path_access_log} ${html5as:path_error_log}
+post = kill -USR1 $(cat ${html5as:path_pid})
+
 # Publish nginx address
 [publish-connection-information]
 recipe = slapos.cookbook:publish
-- 
2.25.1