X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/97c0039729f7c4a8b0d970d41704356246497c1d..93209b63237480e23a68e5d257998f7f7142adeb:/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 649beb846..80a5e8710 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -28,7 +28,7 @@ $wgInternalServer   = 'http://<%= @name %>';
 
 <% if @mediawiki[:ssl_enabled] -%>
 $wgSecureLogin = true;
-$wgDefaultUserOptions['prefershttps'] = 0;
+$wgDefaultUserOptions['prefershttps'] = 1;
 <% end -%>
 $wgCookieSecure = false;
 
@@ -141,7 +141,7 @@ $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
+$wgRightsPage = "Wiki_content_license"; # Set to the title of a wiki page that describes your license/copyright
 $wgRightsUrl  = "http://creativecommons.org/licenses/by-sa/2.0/";
 $wgRightsText = "Creative Commons Attribution-ShareAlike 2.0 license";
 $wgRightsIcon = "/cc-wiki.png";
@@ -312,6 +312,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 -%>