Yuvipanda has uploaded a new change for review.

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


Change subject: Add php / imagemagic config to multimedia role
......................................................................

Add php / imagemagic config to multimedia role

Abstracting out by moving common, extension unrelated multimedia
stuff into the multimedia role. Idea being other extensions/roles
that use some multimedia stuff will include this role.

Change-Id: I5b0e34083aef7c8960a890ddc7b493d9decc3bbf
---
M puppet/manifests/roles.pp
1 file changed, 11 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/56/81956/1

diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index 4bb12bb..9c1353f 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -232,15 +232,7 @@
 class role::uploadwizard {
     include role::mediawiki
     include role::eventlogging
-
-    php::ini { 'uploadsize':
-        settings                => {
-            upload_max_filesize => '100M',
-            post_max_size       => '100M',
-        }
-    }
-
-    package { 'imagemagick': }
+    include role::multimedia
 
     @mediawiki::extension { [ 'CodeEditor', 'WikiEditor' ]: }
 
@@ -372,6 +364,16 @@
 class role::multimedia {
     include role::mediawiki
 
+    # Increase php upload size from default puny 2MB
+    php::ini { 'uploadsize':
+        settings                => {
+            upload_max_filesize => '100M',
+            post_max_size       => '100M',
+        }
+    }
+
+    package { 'imagemagick': }
+
     # Enable dynamic thumbnail generation via the thumb.php
     # script for 404 thumb images.
     @mediawiki::settings { 'thumb.php on 404':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b0e34083aef7c8960a890ddc7b493d9decc3bbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to