Mwalker has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/65423


Change subject: Starting ImageScaler tmp dir move from /a to /tmp
......................................................................

Starting ImageScaler tmp dir move from /a to /tmp

ImageMagick temp directory currently resides in /a/magick-tmp which
collides with other uses of /a. This is the first bit of a move which
will have the new temp directory in /tmp/magick-tmp; but before we
must walk the config over.

so A) Apply this and wait for cluster to pick it up
B) effect MW config change of wgImageMagickTempDir
C) Remove the /a requirements from puppet
D) manually go thru and remove the /a directories on the image scalers

Change-Id: I88554cc9cd4b29e664757e1b4001448c6f20cad9
---
M manifests/imagescaler.pp
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/65423/1

diff --git a/manifests/imagescaler.pp b/manifests/imagescaler.pp
index 593cf5d..2b0316d 100644
--- a/manifests/imagescaler.pp
+++ b/manifests/imagescaler.pp
@@ -7,10 +7,11 @@
 
 class imagescaler::cron {
        cron { removetmpfiles:
-               command => "for dir in /tmp /a/magick-tmp; do find \$dir 
-ignore_readdir_race -type f \\( -name 'gs_*' -o -name 'magick-*' \\) -cmin +15 
-exec rm -f {} \\;; done",
+               command => "for dir in /tmp /a/magick-tmp /tmp/magick-tmp; do 
find \$dir -ignore_readdir_race -type f \\( -name 'gs_*' -o -name 'magick-*' 
\\) -cmin +15 -exec rm -f {} \\;; done",
                user => root,
                minute => '*/5',
-               ensure => present
+               ensure => present;
+
        }
 }
 
@@ -115,6 +116,11 @@
                        group => root,
                        mode => 755,
                        require => File["/a"];
+               "/tmp/magick-tmp":
+                       ensure => directory,
+                       owner => apache,
+                       group => root,
+                       mode => 755;
        }
 
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/65423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88554cc9cd4b29e664757e1b4001448c6f20cad9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mwalker <mwal...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to