X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=templates%2Fetc%2Fs6-services%2Firc-services%2Flog%2Frun.epp;h=21266a84520fb75b905b4cf6501789e87cda15d7;hb=HEAD;hp=58520af0962af1250e00c06a3d0f0bb316255126;hpb=64779f688ac00971b99eea86ae123ea6158b911c;p=user%2Fhenk%2Fcode%2Fpuppet%2Fmodules%2Fhenks_ircservices.git

diff --git a/templates/etc/s6-services/irc-services/log/run.epp b/templates/etc/s6-services/irc-services/log/run.epp
index 58520af..21266a8 100644
--- a/templates/etc/s6-services/irc-services/log/run.epp
+++ b/templates/etc/s6-services/irc-services/log/run.epp
@@ -8,25 +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"
 	-" COMMAND: .* used IDENTIFY and identified for account"
-	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 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"