Merge remote-tracking branch 'github/pull/528'

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

diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index 59b63f753b72f0b5562483a506c923e307aaf5d1..0e0790fdb8359f10e6d318a0759b9dddbdf1f8d1 100644 (file)
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -11,7 +11,6 @@
   CustomLog /var/log/apache2/<%= @name %>-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   CustomLog /var/log/apache2/<%= @name %>-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 

-<% if @ssl_enabled -%>

   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>
   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>


@@ -20,7 +19,6 @@
   ServerName <%= @name %>
 <% @aliases.each do |alias_name| -%>
   ServerAlias <%= alias_name %>
   ServerName <%= @name %>
 <% @aliases.each do |alias_name| -%>
   ServerAlias <%= alias_name %>

-<% end -%>

 
   ServerAdmin webmaster@openstreetmap.org
 
 
   ServerAdmin webmaster@openstreetmap.org
 


@@ -37,16 +35,13 @@
   Alias <%= url %> <%= directory %>
   <Directory <%= directory %>>
     AllowOverride None
   Alias <%= url %> <%= directory %>
   <Directory <%= directory %>>
     AllowOverride None

-    php_admin_flag engine off

     Require all granted
     Require all granted

+    <FilesMatch ".+\.ph(ar|p|tml)$">
+      SetHandler None
+    </FilesMatch>

   </Directory>
 <% end -%>
 
   </Directory>
 <% end -%>
 

-  php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/tmp/
-  php_admin_value disable_functions "exec,shell_exec,system,passthru,popen,proc_open"
-  php_value upload_max_filesize 70M
-  php_value post_max_size 100M
-

   <Directory <%= @directory %>>
     RewriteEngine on
 
   <Directory <%= @directory %>>
     RewriteEngine on
 


@@ -64,6 +59,10 @@
     AllowOverride AuthConfig
 
     Require all granted
     AllowOverride AuthConfig
 
     Require all granted

+
+    <FilesMatch ".+\.ph(ar|p|tml)$">
+      SetHandler "proxy:unix:/run/php/php-<%= @name %>-fpm.sock|fcgi://127.0.0.1"
+    </FilesMatch>

   </Directory>
 
   <Files <%= @directory %>/wp-config.php>
   </Directory>
 
   <Files <%= @directory %>/wp-config.php>


@@ -73,7 +72,9 @@
   <Directory <%= @directory %>/uploads>
     AllowOverride None
     AddType text/plain .html .htm .shtml
   <Directory <%= @directory %>/uploads>
     AllowOverride None
     AddType text/plain .html .htm .shtml

-    php_admin_flag engine off
+    <FilesMatch ".+\.ph(ar|p|tml)$">
+      SetHandler None
+    </FilesMatch>

   </Directory>
 
   <Directory ~ "\.svn">
   </Directory>
 
   <Directory ~ "\.svn">