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

[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 3182f8d587840c42391fec91afebe1f2d14cada9..fd23a53418ef1aa5395e262cd5a5c19308d70a5b 100644 (file)
--- a/cookbooks/mediawiki/templates/default/apache.erb
+++ b/cookbooks/mediawiki/templates/default/apache.erb
@@ -32,6 +32,8 @@
 
   DocumentRoot <%= @directory %>
 
 
   DocumentRoot <%= @directory %>
 

+  AllowEncodedSlashes NoDecode
+

   ProxyTimeout 300
 
   RewriteCond %{SERVER_NAME} !=<%= @name %>
   ProxyTimeout 300
 
   RewriteCond %{SERVER_NAME} !=<%= @name %>


@@ -94,7 +96,7 @@
     Require all granted
 
     <FilesMatch ".+\.ph(ar|p|tml)$">
     Require all granted
 
     <FilesMatch ".+\.ph(ar|p|tml)$">

-      SetHandler "proxy:unix:/run/php/<%= @name %>.sock|fcgi://127.0.0.1"
+      SetHandler "proxy:unix:/run/php/php-<%= @name %>-fpm.sock|fcgi://127.0.0.1"

     </FilesMatch>
   </Directory>
 
     </FilesMatch>
   </Directory>