Complete the renaming of private to private_site

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 1174aed317f446bbaf6a8e1d1441ce675f9b725c..3324e1f9f6d05325a081791b6f14f830765432fb 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -472,7 +472,7 @@ action :create do
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),

-              :private => new_resource.private_site
+              :private_site => new_resource.private_site

     reload_apache false
   end
 
     reload_apache false
   end
 

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index dc14397503a09a4d0b28d19097808fdc8c1fc1b3..f8ad628973c039ffd5bf3cecfba21f90fd4098d7 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -193,7 +193,7 @@ $wgGroupPermissions['bureaucrat']['suppressionlog'] = true;
 $wgGroupPermissions['*']['createaccount'] = false;
 $wgGroupPermissions['user']['createaccount'] = true;
 <% end -%>
 $wgGroupPermissions['*']['createaccount'] = false;
 $wgGroupPermissions['user']['createaccount'] = true;
 <% end -%>

-<% if @mediawiki[:private] -%>
+<% if @mediawiki[:private_site] -%>

 
 #Disable reading by anonymous users
 $wgGroupPermissions['*']['read'] = false;
 
 #Disable reading by anonymous users
 $wgGroupPermissions['*']['read'] = false;

diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb
index ab16ce428eeafd724aebbd1b4860e833c480fe48..f41e4ca50e0304663b0138a4c73e7d9d4db1ff6f 100644 (file)
--- a/cookbooks/mediawiki/templates/default/apache.erb
+++ b/cookbooks/mediawiki/templates/default/apache.erb
@@ -80,7 +80,7 @@
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml

-<% if @private -%>
+<% if @private_site -%>

     Require all denied
 <% end -%>
   </Directory>
     Require all denied
 <% end -%>
   </Directory>