refine logging config

[user/henk/code/puppet/modules/henks_ircservices.git] / templates / etc / s6-services / irc-services / log / run.epp

diff --git a/templates/etc/s6-services/irc-services/log/run.epp b/templates/etc/s6-services/irc-services/log/run.epp
index 80a5a0bd7d8a32988d28d4a805d3ecbd98af3453..21266a84520fb75b905b4cf6501789e87cda15d7 100644 (file)
--- a/templates/etc/s6-services/irc-services/log/run.epp
+++ b/templates/etc/s6-services/irc-services/log/run.epp
@@ -8,26 +8,44 @@
 <% } -%>
 
 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
        --
+       t
+       T
+       s1048576
+       S2147483648
+       n100
+       "${LOGDIR}/full_logs"
+       n1
        -" USERS: .* connected to the network"
        -" USERS: .* disconnected from the network"
        -" USERS: .* is now away:"
        -" USERS: .* is no longer away"
        -" USERS: .* quit"
        -" USERS: .* changed nick to"
-       -" USERS: .* changes modes to \+[ix]+"
+       -" USERS: .* changes modes to \\+[cix]+"
        -" USERS: .* is no longer identified as"
        -" USERS: .* used IDENTIFY and identified for account"
        -" USERS: .* is now identified as"
-       -" CHANNEL: .* join"
-       -" CHANNEL: .* create"
-       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"
+       -" COMMAND: .* used IDENTIFY and identified for account"
+       -" COMMAND: .* used UNBAN on all channels"
+       -" CHANNEL: .* join #.*"
+       -" M_SASL: .* identified to account .* using SASL"
+       -" Anope [[:digit:].]+, build #[[:digit:]], compiled .*"
+       -" Anope [[:digit:].]+ starting up"
+       -"Using configuration file conf/services.conf"
+       -"Loading modules\\.\\.\\."
+       -"Loading databases\\.\\.\\."
+       -"Databases loaded"
+       -"Attempting to connect to uplink #[[:digit:]]+ [[:alnum:].-]+ ([[:alnum:]./-]+) with protocol InspIRCd 3"
+       -"Inheriting commands and privs from .* to .*"
+       -"M_HTTPD: Created HTTP server httpd/main"
+       -"Successfully connected to uplink #[[:digit:]]+ [[:alnum:].:-]+"
+       -"Tied oper henk to type Services Root"
+       -"Using IRCd protocol inspircd3"
+       !"background { redirfd -r 0 ${MAIL_FIFO} mail -s \"irc-services log: ${NETWORK_NAME}\" -- root } tee ${MAIL_FIFO}"
+       "${LOGDIR}/logs"