From: Tom Hughes <tom@compton.nu>
Date: Thu, 13 Sep 2018 19:23:02 +0000 (+0100)
Subject: Complete the renaming of private to private_site
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/9b8faa3fefb5e71b55429bc6b86ba72383cbf3eb?hp=7797ba038f496cb453193df985523e0dc5c435ec

Complete the renaming of private to private_site
---

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 1174aed31..3324e1f9f 100644
--- 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),
-              :private => new_resource.private_site
+              :private_site => new_resource.private_site
     reload_apache false
   end
 
diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index dc1439750..f8ad62897 100644
--- 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 -%>
-<% if @mediawiki[:private] -%>
+<% if @mediawiki[:private_site] -%>
 
 #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 ab16ce428..f41e4ca50 100644
--- 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
-<% if @private -%>
+<% if @private_site -%>
     Require all denied
 <% end -%>
   </Directory>