From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 11 Mar 2019 12:29:59 +0000 (+0100)
Subject: Merge branch 'next' into exception-notifier
X-Git-Tag: 5.2.0_Alpha_1~220^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7736df05e193c407092e02cab00734367c28a76c;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'next' into exception-notifier
---

7736df05e193c407092e02cab00734367c28a76c
diff --cc com.woltlab.wcf/cronjob.xml
index affba31de8,012ea2c015..c6d28f11d7
--- a/com.woltlab.wcf/cronjob.xml
+++ b/com.woltlab.wcf/cronjob.xml
@@@ -202,15 -202,18 +202,28 @@@
  			<startdow>*</startdow>
  			<canbedisabled>0</canbedisabled>
  		</cronjob>
 +		<cronjob name="com.woltlab.wcf.exceptionMailer">
 +			<classname>wcf\system\cronjob\ExceptionMailerCronjob</classname>
 +			<description>Sends out notifications about new entries in the error log.</description>
 +			<description language="de">Versendet Benachrichtigungen über neue Einträge im Fehlerprotokoll.</description>
 +			<startminute>0</startminute>
 +			<starthour>5</starthour>
 +			<startdom>*</startdom>
 +			<startmonth>*</startmonth>
 +			<startdow>*</startdow>
 +		</cronjob>
+ 		<cronjob name="com.woltlab.wcf.updateBlacklist">
+ 			<classname>wcf\system\cronjob\UpdateBlacklistCronjob</classname>
+ 			<description>Refreshes the blacklist for spam prevention</description>
+ 			<description language="de">Aktualisiert die Sperrlisten zur Spambekämpfung</description>
+ 			<!-- Runs once every hour, even though the data is only refreshed every 6 hours,
+ 			     but allows instances to catch up when it misses some updates. -->
+ 			<startminute>15</startminute>
+ 			<starthour>*</starthour>
+ 			<startdom>*</startdom>
+ 			<startmonth>*</startmonth>
+ 			<startdow>*</startdow>
+ 			<canbedisabled>0</canbedisabled>
+ 		</cronjob>
  	</import>
  </data>