Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74591
Change subject: Properly puppeti[sz]e purge-checkuser
......................................................................
Properly puppeti[sz]e purge-checkuser
Bug: 51572
Change-Id: Iaed6e910fb9c154ad56b0b31dae3f7009ba50df1
---
M manifests/misc/deployment.pp
M manifests/misc/maintenance.pp
M manifests/site.pp
3 files changed, 24 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/74591/1
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 047e44c..c69ecb2 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -84,11 +84,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 c8ec58d..d8108cf 100644
--- a/manifests/misc/maintenance.pp
+++ b/manifests/misc/maintenance.pp
@@ -393,3 +393,26 @@
}
}
+
+class misc::maintenance::purge_checkuser( $enabled = false ) } {
+ $scriptpath = "/usr/local/bin"
+
+ "${scriptpath}/purge-checkuser":
+ owner => root,
+ group => root,
+ mode => 0555,
+ source => "puppet:///files/misc/scripts/purge-checkuser";
+
+ cron { 'purge-checkuser':
+ user => root,
+ minute => 0,
+ hour => 0,
+ weekday => 0,
+ command => "${scriptpath}/purge-checkuser",
+ ensure => $enabled ?{
+ true => present,
+ false => absent,
+ default => absent
+ };
+ }
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 1440424..a73975a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2739,6 +2739,7 @@
class { misc::maintenance::cleanup_upload_stash: enabled => true }
class { misc::maintenance::tor_exit_node: enabled => true }
class { misc::maintenance::aft5: enabled => true }
+ class { misc::maintenance::purge_checkuser: enabled => true }
# Broken cron jobs moved back to hume:
class { misc::maintenance::geodata: enabled => true }
--
To view, visit https://gerrit.wikimedia.org/r/74591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaed6e910fb9c154ad56b0b31dae3f7009ba50df1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
