mediawiki: fix site name scoping

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 976913cdef7c25aa444b60395e742ef8c6caa4fb..0508bcbad340be57ed115360a836b901953b9f1a 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -654,7 +654,6 @@ action_class do
 
   def mediawiki_params
     {
 
   def mediawiki_params
     {

-      :site => => new_resource.site,

       :sitename => new_resource.sitename,
       :metanamespace => new_resource.metanamespace,
       :logo => new_resource.logo,
       :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 d67e65e56e046f14e84d5ac94c125e67f7eca2de..7b7190005395909fc09b8aec55c64c28eb2ff5ba 100644 (file)
--- 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 -%>
 
 $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';
 # DE
 define('NS_LANG_DE', 200);
 $wgExtraNamespaces[NS_LANG_DE] = 'DE';