From: Grant Date: Sun, 3 Apr 2022 02:03:56 +0000 (+0100) Subject: Revert "mediawiki: Use QuickInstantCommons to enable commons" X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/b77293aa724845225fa5abd14001ba2e3e2ec845?ds=sidebyside Revert "mediawiki: Use QuickInstantCommons to enable commons" This reverts commit 31849a61aae4c2f99f029ef826c0dacee3440a7f. --- diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb index 452a4af8c..8b29cc7c4 100644 --- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb +++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb @@ -111,6 +111,22 @@ $wgSVGConverters = array( 'rsvg' => '/usr/bin/rsvg-convert -w $width -h $height $wgSVGConverter = 'rsvg'; $wgSVGMaxSize = 2000; +<% if @mediawiki[:commons] -%> +# Enable use of images from https://commons.wikimedia.org +$wgForeignFileRepos[] = [ + 'class' => ForeignAPIRepo::class, + 'name' => 'wikimediacommons', + 'apibase' => 'https://commons.wikimedia.org/w/api.php', + 'url' => 'https://upload.wikimedia.org/wikipedia/commons', + 'thumbUrl' => 'https://upload.wikimedia.org/wikipedia/commons/thumb', + 'hashLevels' => 2, + 'transformVia404' => true, + 'fetchDescription' => true, + 'descriptionCacheExpiry' => 43200, + 'apiThumbCacheExpiry' => 86400, +]; +<% end -%> + ## If you use ImageMagick (or any other shell command) on a ## Linux server, this will need to be set to the name of an ## available UTF-8 locale @@ -263,7 +279,7 @@ $wgAllowExternalImagesFrom = array( 'http://tile.openstreetmap.org/', 'https://t $wgNoFollowDomainExceptions = array( 'www.openstreetmap.org', 'josm.openstreetmap.de', 'taginfo.openstreetmap.org', 'blog.openstreetmap.org', 'wiki.osmfoundation.org' ); # FIXME - move to specific -# defines which links of the sidebar are translatable +# defines which links of the sidebar are translatable $wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'mapfeatures-url', 'contributors-url', 'helppage', 'blogs-url', 'shop-url', 'sitesupport-url' ); # FIXME - move to specific