From: Grant Slater <git@firefishy.com>
Date: Tue, 2 Aug 2022 21:41:36 +0000 (+0300)
Subject: mediawiki: fix site name scoping
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/f3a8f9b9c6f82205ec5509f311b0a1edeac3d40c

mediawiki: fix site name scoping
---

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 976913cde..0508bcbad 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -654,7 +654,6 @@ action_class do
 
   def mediawiki_params
     {
-      :site => => new_resource.site,
       :sitename => new_resource.sitename,
       :metanamespace => new_resource.metanamespace,
       :logo => new_resource.logo,
diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index d67e65e56..7b7190005 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -275,7 +275,7 @@ $wgSiteNotice = "<%= @mediawiki[:site_notice] %>";
 $wgReadOnly = "<%= @mediawiki[:site_readonly] %>";
 <% end -%>
 
-<% if @mediawiki[:site] == "wiki.openstreetmap.org" -%>
+<% if @name == "wiki.openstreetmap.org" -%>
 # DE
 define('NS_LANG_DE', 200);
 $wgExtraNamespaces[NS_LANG_DE] = 'DE';