Complete the renaming of private to private_site

[chef.git] / cookbooks / mediawiki / templates / default / apache.erb

diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb
index 913fc9acc52b8da27bcc28cfb2dabfbe892016be..f41e4ca50e0304663b0138a4c73e7d9d4db1ff6f 100644 (file)
--- a/cookbooks/mediawiki/templates/default/apache.erb
+++ b/cookbooks/mediawiki/templates/default/apache.erb
@@ -32,9 +32,9 @@
 
   DocumentRoot <%= @directory %>
 
 
   DocumentRoot <%= @directory %>
 

-  php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/tmp/
+  php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/dev/null:/tmp/

   #php_admin_value disable_functions "exec,shell_exec,system,passthru,popen,proc_open"
   #php_admin_value disable_functions "exec,shell_exec,system,passthru,popen,proc_open"

-  php_value memory_limit 128M
+  php_value memory_limit 368M

   php_value max_execution_time 240
   php_value upload_max_filesize 70M
   php_value post_max_size 100M
   php_value max_execution_time 240
   php_value upload_max_filesize 70M
   php_value post_max_size 100M


@@ -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>