refine logging config

diff --git a/templates/etc/s6-services/irc-services/log/run.epp b/templates/etc/s6-services/irc-services/log/run.epp
index 4f56d7884d9abc2dd9b0e2ddcacb9d7b65f5e602..21266a84520fb75b905b4cf6501789e87cda15d7 100644 (file)
--- a/templates/etc/s6-services/irc-services/log/run.epp
+++ b/templates/etc/s6-services/irc-services/log/run.epp
@@ -8,12 +8,19 @@
 <% } -%>
 
 define NETWORK_NAME <%= $network_name %>
 <% } -%>
 
 define NETWORK_NAME <%= $network_name %>

-define SERVICES_LOGDIR /var/log/s6/irc-services-${NETWORK_NAME}
-define SERVICES_MAIL_FIFO ${SERVICES_LOGDIR}/mail_fifo
+define LOGDIR /var/log/s6/irc-services-${NETWORK_NAME}
+define MAIL_FIFO ${LOGDIR}/mail_fifo

 
 fdmove -c 2 1
 s6-log
        --
 
 fdmove -c 2 1
 s6-log
        --

+       t
+       T
+       s1048576
+       S2147483648
+       n100
+       "${LOGDIR}/full_logs"
+       n1

        -" USERS: .* connected to the network"
        -" USERS: .* disconnected from the network"
        -" USERS: .* is now away:"
        -" USERS: .* connected to the network"
        -" USERS: .* disconnected from the network"
        -" USERS: .* is now away:"


@@ -40,9 +47,5 @@ s6-log
        -"Successfully connected to uplink #[[:digit:]]+ [[:alnum:].:-]+"
        -"Tied oper henk to type Services Root"
        -"Using IRCd protocol inspircd3"
        -"Successfully connected to uplink #[[:digit:]]+ [[:alnum:].:-]+"
        -"Tied oper henk to type Services Root"
        -"Using IRCd protocol inspircd3"

-       t
-       T
-       s1048576
-       S2147483648
-       !"background { redirfd -r 0 ${SERVICES_MAIL_FIFO} mail -s \"irc-services log: ${NETWORK_NAME}\" -- root } tee ${SERVICES_MAIL_FIFO}"
-       "${SERVICES_LOGDIR}/logs"
+       !"background { redirfd -r 0 ${MAIL_FIFO} mail -s \"irc-services log: ${NETWORK_NAME}\" -- root } tee ${MAIL_FIFO}"
+       "${LOGDIR}/logs"