Merge remote-tracking branch 'github/pull/496'

[chef.git] / cookbooks / mediawiki / templates / default / LocalSettings.php.erb

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index 8b29cc7c401d8b6f7d1c0dceee540573563210fc..b27f7c11ba223a660b23bc4868b52ddf053eae13 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -95,6 +95,7 @@ $wgFileExtensions[] = 'odp';
 $wgFileExtensions[] = 'ods';
 $wgFileExtensions[] = 'svg';
 $wgFileExtensions[] = 'osm';
+$wgFileExtensions[] = 'odg';
 <% @mediawiki[:extra_file_extensions].each do |mw_extra_file_extension| -%>
        $wgFileExtensions[] = '<%= mw_extra_file_extension %>';
 <% end -%>
@@ -117,14 +118,14 @@ $wgForeignFileRepos[] = [
   'class' => ForeignAPIRepo::class,
   'name' => 'wikimediacommons',
   'apibase' => 'https://commons.wikimedia.org/w/api.php',
-  'url' => 'https://upload.wikimedia.org/wikipedia/commons', 
+  '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,
-];   
+  'descriptionCacheExpiry' => 604800,
+  'apiThumbCacheExpiry' => 604800,
+];
 <% end -%>
 
 ## If you use ImageMagick (or any other shell command) on a
@@ -279,7 +280,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