Florianschmidtwelzow has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/341197 )
Change subject: Save logs of generate CAPTCHA cron to /var/log/mediawiki
......................................................................
Save logs of generate CAPTCHA cron to /var/log/mediawiki
The logs will be saved in /var/log/mediawiki/generate-fancycaptcha
and rotated every month, keeping the 3 newest up to 90 days.
Bug: T159610
Change-Id: I17d1348c3d8ce23803b4ee00e3d0561314d723f0
---
A modules/mediawiki/files/maintenance/logrotate.d_generate-fancycaptcha
M modules/mediawiki/manifests/maintenance/generatecaptcha.pp
2 files changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/341197/1
diff --git
a/modules/mediawiki/files/maintenance/logrotate.d_generate-fancycaptcha
b/modules/mediawiki/files/maintenance/logrotate.d_generate-fancycaptcha
new file mode 100644
index 0000000..377e06a
--- /dev/null
+++ b/modules/mediawiki/files/maintenance/logrotate.d_generate-fancycaptcha
@@ -0,0 +1,15 @@
+#####################################################################
+### THIS FILE IS MANAGED BY PUPPET
+#####################################################################
+
+/var/log/mediawiki/generate-fancycaptcha/*.log {
+ monthly
+ notifempty
+ maxage 90
+ rotate 3
+ dateext
+ compress
+ delaycompress
+ missingok
+ nocreate
+}
diff --git a/modules/mediawiki/manifests/maintenance/generatecaptcha.pp
b/modules/mediawiki/manifests/maintenance/generatecaptcha.pp
index 9af78d8..12bc83d 100644
--- a/modules/mediawiki/manifests/maintenance/generatecaptcha.pp
+++ b/modules/mediawiki/manifests/maintenance/generatecaptcha.pp
@@ -23,6 +23,18 @@
content => secret('fancycaptcha/badwords');
}
+ file { '/var/log/mediawiki/generate-fancycaptcha':
+ ensure => ensure_directory($ensure),
+ mode => '0775',
+ owner => $::mediawiki::users::web,
+ group => $::mediawiki::users::web,
+ }
+
+ logrotate::conf { 'generate-fancycaptcha':
+ ensure => $ensure,
+ source =>
'puppet:///modules/mediawiki/maintenance/logrotate.d_generate-fancycaptcha',
+ }
+
cron { 'generatecaptcha':
ensure => $ensure,
user => $::mediawiki::users::web,
@@ -30,6 +42,6 @@
hour => 1,
minute => 0,
require => File['/etc/fancycaptcha/words',
'/etc/fancycaptcha/badwords'],
- command => '/usr/local/bin/mwscript
extensions/ConfirmEdit/maintenance/GenerateFancyCaptchas.php enwiki
--wordlist=/etc/fancycaptcha/words
--font=/usr/share/fonts/truetype/freefont/FreeMonoBoldOblique.ttf
--blacklist=/etc/fancycaptcha/badwords --fill=10000 --oldcaptcha --delete
>/dev/null 2>&1',
+ command => '/usr/local/bin/mwscript
extensions/ConfirmEdit/maintenance/GenerateFancyCaptchas.php enwiki
--wordlist=/etc/fancycaptcha/words
--font=/usr/share/fonts/truetype/freefont/FreeMonoBoldOblique.ttf
--blacklist=/etc/fancycaptcha/badwords --fill=10000 --oldcaptcha --delete
>/var/log/mediawiki/generate-fancycaptcha/cron.log 2>&1',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/341197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17d1348c3d8ce23803b4ee00e3d0561314d723f0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Florianschmidtwelzow <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
