Matanya has uploaded a new change for review. https://gerrit.wikimedia.org/r/122658
Change subject: purge-checkuser: puppetize ...................................................................... purge-checkuser: puppetize Another attempt to do https://gerrit.wikimedia.org/r/#/c/74591/11 After it was reverted in https://gerrit.wikimedia.org/r/#/c/122616/ Change-Id: If336eea37ee624ede0ec445415aa376431ac0028 --- M manifests/misc/deployment.pp M manifests/misc/maintenance.pp M manifests/site.pp M templates/misc/mw-deployment-vars.erb 4 files changed, 29 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/58/122658/1 diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp index 922da9b..467587b 100644 --- a/manifests/misc/deployment.pp +++ b/manifests/misc/deployment.pp @@ -89,11 +89,6 @@ group => root, mode => 0555, source => "puppet:///files/misc/scripts/notifyNewProjects"; - "${scriptpath}/purge-checkuser": # FIXME this is for a hume cronjob. Should puppetize the cronjob and move this to another class - owner => root, - group => root, - mode => 0555, - source => "puppet:///files/misc/scripts/purge-checkuser"; "${scriptpath}/purge-varnish": owner => root, group => root, diff --git a/manifests/misc/maintenance.pp b/manifests/misc/maintenance.pp index 20b2081..2177a96 100644 --- a/manifests/misc/maintenance.pp +++ b/manifests/misc/maintenance.pp @@ -558,3 +558,27 @@ ensure => $status, } } + +class misc::maintenance::purge_checkuser( $enabled = false ) { + $status = $enabled ? { + true => 'present', + false => 'absent', + default => 'absent', + } + + file { '/usr/local/bin/purge-checkuser': + owner => 'apache', + group => 'apache', + mode => '0555', + source => 'puppet:///files/misc/scripts/purge-checkuser', + } + + cron { 'purge-checkuser': + ensure => $status, + user => 'apache', + minute => 0, + hour => 0, + weekday => 0, + command => '/usr/local/bin/purge-checkuser', + } +} diff --git a/manifests/site.pp b/manifests/site.pp index 15c6195..fb99760 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2540,6 +2540,10 @@ enabled => true, } + class { 'misc::maintenance::purge_checkuser': + enabled => true, + } + # (bug 15434) Periodical run of currently disabled special pages # to be run against PMTPA slaves class { 'misc::maintenance::updatequerypages': diff --git a/templates/misc/mw-deployment-vars.erb b/templates/misc/mw-deployment-vars.erb index fd2d5f1..db46018 100644 --- a/templates/misc/mw-deployment-vars.erb +++ b/templates/misc/mw-deployment-vars.erb @@ -4,7 +4,7 @@ MW_COMMON_SOURCE="<%= mw_common_source %>" MW_DBLISTS="<%= dblist_common %>" MW_DBLISTS_SOURCE="<%= dblist_common_source %>" -MW_CRON_LOGS="/home/wikipedia/logs/norotate" +MW_CRON_LOGS="/var/log/mediawiki" MW_RSYNC_HOST="<%= mw_rsync_host %>" MW_DSH_ARGS=('-cM' '-g' 'mediawiki-installation' '-o' '-oSetupTimeout=30' '-F30') MW_RSYNC_ARGS=('-a' '--delete-delay' '--delay-updates' '--compress' '--delete' '--exclude=**/.svn/lock' '--exclude=**/.git/objects' '--exclude=**/.git/**/objects' '--exclude=**/cache/l10n/*.cdb' '--no-perms') -- To view, visit https://gerrit.wikimedia.org/r/122658 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If336eea37ee624ede0ec445415aa376431ac0028 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya <mata...@foss.co.il> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
