Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/90117
Change subject: Simplify misc::maintenance::update_special_pages a bit
......................................................................
Simplify misc::maintenance::update_special_pages a bit
As per misc::maintenance::update_flaggedrev_stats above: file before cron, no
flock.
I think flock is not needed now that there is no concurrent
update-special-pages-small
running any more; if it takes more than 3 days to complete, it should be split
or made
less frequent.
Elsewhere, some directories are created with with owner/group apache/root, but
seems ok.
Other supposedly irrelevant differences in manifests/site.pp:
* includes terbium has, which hume doesn't:
generic::mysql::packages::client, nfs::netapp::home,
nfs::upload, misc::monitoring::jobqueue;
* includes hume has, which terbium doesn't:
role::db::maintenance, generic::wikidev-umask.
Bug: 53227
Change-Id: I1ebbd1ed3688f55a9ab9b28d3b8a4e287b12e93a
---
M manifests/misc/maintenance.pp
1 file changed, 13 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/90117/1
diff --git a/manifests/misc/maintenance.pp b/manifests/misc/maintenance.pp
index 626b7d8..56df259 100644
--- a/manifests/misc/maintenance.pp
+++ b/manifests/misc/maintenance.pp
@@ -211,9 +211,21 @@
}
class misc::maintenance::update_special_pages( $enabled = false ) {
+
+ file {
+ "/usr/local/bin/update-special-pages":
+ source =>
"puppet:///files/misc/scripts/update-special-pages",
+ owner => apache,
+ group => wikidev,
+ mode => 0755,
+ ensure => present;
+ "/usr/local/bin/update-special-pages-small":
+ ensure => absent;
+ }
+
cron {
update_special_pages:
- command => "flock -n /var/lock/update-special-pages
/usr/local/bin/update-special-pages > /var/log/updateSpecialPages.log 2>&1",
+ command => "/usr/local/bin/update-special-pages >
/var/log/updateSpecialPages.log 2>&1",
user => "apache",
monthday => "*/3",
hour => 5,
@@ -224,17 +236,6 @@
default => absent
};
update_special_pages_small:
- ensure => absent;
- }
-
- file {
- "/usr/local/bin/update-special-pages":
- source =>
"puppet:///files/misc/scripts/update-special-pages",
- owner => apache,
- group => wikidev,
- mode => 0755,
- ensure => present;
- "/usr/local/bin/update-special-pages-small":
ensure => absent;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/90117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ebbd1ed3688f55a9ab9b28d3b8a4e287b12e93a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Nemo bis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
