Enable resolved prometheus exporter

[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 cabc752a1eeefe929e494be945417afaed951c37..93aab016daf788ef372de12595794269451c2b75 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -54,6 +54,15 @@ $wgEmailAuthentication = true;
 
 $wgEnotifUseJobQ       = true;
 
 
 $wgEnotifUseJobQ       = true;
 

+$wgSMTP = [
+  "host" => "localhost",
+  "socket_options" => [
+    "ssl" => [
+      "verify_peer_name" => false
+    ]
+  ]
+];
+

 ## Database settings
 $wgDBtype           = "mysql";
 $wgDBserver         = "<%= @database_params[:host] %>";
 ## Database settings
 $wgDBtype           = "mysql";
 $wgDBserver         = "<%= @database_params[:host] %>";


@@ -129,7 +138,7 @@ $wgShellLocale = "en_US.utf8";
 ## Set $wgCacheDirectory to a writable directory on the web server
 ## to make your wiki go slightly faster. The directory should not
 ## be publically accessible from the web.
 ## Set $wgCacheDirectory to a writable directory on the web server
 ## to make your wiki go slightly faster. The directory should not
 ## be publically accessible from the web.

-#$wgCacheDirectory = "$IP/cache";
+$wgCacheDirectory = "$IP/cache";

 
 # Site language code, should be one of the list in ./languages/Names.php
 $wgLanguageCode = "en";
 
 # Site language code, should be one of the list in ./languages/Names.php
 $wgLanguageCode = "en";


@@ -222,10 +231,8 @@ $wgNamespacesWithSubpages[NS_MAIN] = true;
 # DNS Blacklists to use
 $wgEnableDnsBlacklist = true;
 $wgDnsBlacklistUrls = [
 # DNS Blacklists to use
 $wgEnableDnsBlacklist = true;
 $wgDnsBlacklistUrls = [

-  'proxies.dnsbl.sorbs.net.',
-  'opm.tornevall.org.',
-  'xbl.spamhaus.org.',
-  'dnsbl-2.uceprotect.net.'
+  'http.dnsbl.sorbs.net.',
+  'dnsbl-1.uceprotect.net.'

 ];
 
 # Require validated email to edit
 ];
 
 # Require validated email to edit


@@ -361,7 +368,7 @@ $wgExtraNamespaces[NS_PROPOSAL] = 'Proposal';
 $wgNamespacesWithSubpages[NS_PROPOSAL] = TRUE;
 $wgContentNamespaces[] = NS_PROPOSAL;
 define('NS_PROPOSAL_TALK', 3001);
 $wgNamespacesWithSubpages[NS_PROPOSAL] = TRUE;
 $wgContentNamespaces[] = NS_PROPOSAL;
 define('NS_PROPOSAL_TALK', 3001);

-$wgExtraNamespaces[NS_PROPOSAL_TALK] = 'Proposal talk';
+$wgExtraNamespaces[NS_PROPOSAL_TALK] = 'Proposal_talk';

 $wgNamespacesWithSubpages[NS_PROPOSAL_TALK] = TRUE;
 
 $wgNamespacesToBeSearchedDefault[NS_LANG_DE] = TRUE;
 $wgNamespacesWithSubpages[NS_PROPOSAL_TALK] = TRUE;
 
 $wgNamespacesToBeSearchedDefault[NS_LANG_DE] = TRUE;


@@ -383,7 +390,8 @@ $wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'mapfeatures-url', 'contribut
 <% end -%>
 
 <% if @name == "wiki.openstreetmap.org" -%>
 <% end -%>
 
 <% if @name == "wiki.openstreetmap.org" -%>

-# Placeholder for the wiki.openstreetmap.org specific config
+# wiki.openstreetmap.org specific config loaded after extensions
+$wgRCWatchCategoryMembership = true;

 <% end -%>
 
 <% if not(@mediawiki[:private_accounts]) and not(@mediawiki[:private_site]) -%>
 <% end -%>
 
 <% if not(@mediawiki[:private_accounts]) and not(@mediawiki[:private_site]) -%>


@@ -423,4 +431,4 @@ unset( $wgGroupsRemoveFromSelf['autoconfirmed'] );
 # Increase curl timeout to allow parsoid requests to heavy pages like Map Features
 # Mediawiki 1.38 has fix to allow this to be set by $wgVirtualRestConfig
 # https://phabricator.wikimedia.org/T285478
 # Increase curl timeout to allow parsoid requests to heavy pages like Map Features
 # Mediawiki 1.38 has fix to allow this to be set by $wgVirtualRestConfig
 # https://phabricator.wikimedia.org/T285478

-$wgHTTPTimeout = 90;
+$wgHTTPTimeout = 240;