refine logging config

diff --git a/templates/user_scandir/log/run.epp b/templates/user_scandir/log/run.epp
index 37cc89f33a8c8c82045c893727589cf4adcde00d..991b48f19fe9575a6d406d5de2e6624945c25aaf 100644 (file)
--- a/templates/user_scandir/log/run.epp
+++ b/templates/user_scandir/log/run.epp
@@ -8,13 +8,18 @@
 <% } -%>
 
 define SVUSER <%= $username %>
-define SVLOGDIR /var/log/s6/user_scandir_${SVUSER}/logs/
+define LOGDIR /var/log/s6/user_scandir_${SVUSER}
+define MAIL_FIFO ${LOGDIR}/mail_fifo
 
 fdmove -c 2 1
 s6-log
+       --
        t
        T
        s1048576
        S2147483648
-       !"mail -s \"user_sv log: ${SVUSER}\" -- root"
-       ${SVLOGDIR}
+       n100
+       "${LOGDIR}/full_logs"
+       n1
+       !"background { redirfd -r 0 ${MAIL_FIFO} mail -s \"user_sv log: ${SVUSER}\" -- root } tee ${MAIL_FIFO}"
+       "${LOGDIR}/logs"