X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d0a6dd09b9cd9d1c493c15adfd25b880f505e9af..583a01cf4a834db5e803b7004e5b7bd03284e7b6:/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 85151cfdf..dc1439750 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -16,7 +16,7 @@ $wgMetaNamespace = '<%= @mediawiki[:metanamespace] %>';
 ## defaults for all runtime URL paths are based off of this.
 ## For more information on customizing the URLs
 ## (like /w/index.php/Page_title to /wiki/Page_title) please see:
-## http://www.mediawiki.org/wiki/Manual:Short_URL
+## https://www.mediawiki.org/wiki/Manual:Short_URL
 $wgScriptPath       = "/w";
 $wgArticlePath      = '/wiki/$1';
 $wgUsePathInfo      = true;
@@ -24,13 +24,11 @@ $wgScriptExtension  = ".php";
 
 ## The protocol and server name to use in fully-qualified URLs
 $wgServer           = "//<%= @name %>";
-$wgInternalServer   = 'http://<%= @name %>';
+$wgInternalServer   = 'https://<%= @name %>';
 
-<% if @mediawiki[:ssl_enabled] -%>
 $wgSecureLogin = true;
-$wgDefaultUserOptions['prefershttps'] = 0;
-<% end -%>
-$wgCookieSecure = false;
+$wgDefaultUserOptions['prefershttps'] = 1;
+$wgCookieSecure = true;
 
 ## The relative URL path to the skins directory
 $wgStylePath        = "$wgScriptPath/skins";
@@ -93,16 +91,26 @@ $wgFileExtensions[] = 'doc';
 $wgFileExtensions[] = 'pdf';
 $wgFileExtensions[] = 'odt';
 $wgFileExtensions[] = 'odp';
+$wgFileExtensions[] = 'ods';
 $wgFileExtensions[] = 'svg';
+$wgFileExtensions[] = 'osm';
 <% @mediawiki[:extra_file_extensions].each do |mw_extra_file_extension| -%>
 	$wgFileExtensions[] = '<%= mw_extra_file_extension %>';
 <% end -%>
 
+# Add OSM XML file format per http://www.iana.org/assignments/media-types/media-types.xhtml
+# Shout out to Paul Norman for reserving this.
+# Helps MimeMagic determine XML-based formats and chooses the correct MimeType
+# for .osm files.
+$wgXMLMimeTypes[] = array('osm' => 'application/vnd.openstreetmap.data+xml');
+
+$wgTrustedMediaFormats[] = 'application/vnd.openstreetmap.data+xml';
+
 $wgSVGConverters = array( 'rsvg' => '/usr/bin/rsvg-convert -w $width -h $height -o $output $input');
 $wgSVGConverter = 'rsvg';
 $wgSVGMaxSize = 2000;
 
-# InstantCommons allows wiki to use images from http://commons.wikimedia.org
+# InstantCommons allows wiki to use images from https://commons.wikimedia.org
 <% if @mediawiki[:commons] -%>
 $wgUseInstantCommons  = true;
 <% else -%>
@@ -141,8 +149,8 @@ $wgDefaultSkin = "<%= @mediawiki[:skin] %>";
 ## For attaching licensing metadata to pages, and displaying an
 ## appropriate copyright notice / icon. GNU Free Documentation
 ## License and Creative Commons licenses are supported so far.
-$wgRightsPage = "OpenStreetMap_License"; # Set to the title of a wiki page that describes your license/copyright
-$wgRightsUrl  = "http://creativecommons.org/licenses/by-sa/2.0/";
+$wgRightsPage = "Wiki_content_license"; # Set to the title of a wiki page that describes your license/copyright
+$wgRightsUrl  = "https://creativecommons.org/licenses/by-sa/2.0/";
 $wgRightsText = "Creative Commons Attribution-ShareAlike 2.0 license";
 $wgRightsIcon = "/cc-wiki.png";
 
@@ -168,9 +176,9 @@ $wgGroupPermissions['user']['move'] = false;
 $wgGroupPermissions['user']['movefile'] = false;
 $wgGroupPermissions['user']['move-categorypages'] = false;
 $wgGroupPermissions['user']['upload'] = false;
-$wgGroupPermissions['autoconfirmed']['move'] = false;
-$wgGroupPermissions['autoconfirmed']['movefile'] = false;
-$wgGroupPermissions['autoconfirmed']['move-categorypages'] = false;
+$wgGroupPermissions['autoconfirmed']['move'] = true;
+$wgGroupPermissions['autoconfirmed']['movefile'] = true;
+$wgGroupPermissions['autoconfirmed']['move-categorypages'] = true;
 $wgGroupPermissions['autoconfirmed']['upload'] = true;
 
 #Allow bureaucrat group access to oversight options
@@ -312,6 +320,9 @@ $wgNamespacesToBeSearchedDefault[NS_LANG_NL] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_LANG_RU] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_LANG_JA] = TRUE;
 
+<% if @mediawiki[:site_notice] -%>
+$wgSiteNotice = "<%= @mediawiki[:site_notice] %>";
+<% end -%>
 <% if @mediawiki[:site_readonly] -%>
 $wgReadOnly = "<%= @mediawiki[:site_readonly] %>";
 <% end -%>