Fix flag matches to work on 20.04

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

diff --git a/cookbooks/dmca/templates/default/apache.erb b/cookbooks/dmca/templates/default/apache.erb
index bf53e2d2e41b4449a0e198ab6a3f8476a61a1911..5b2e320d693d5720008ec86654da3bdd259c045d 100644 (file)
--- a/cookbooks/dmca/templates/default/apache.erb
+++ b/cookbooks/dmca/templates/default/apache.erb
@@ -44,11 +44,15 @@
   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
 

-  DocumentRoot <%= @directory %>/html
+  DocumentRoot <%= @directory %>

 
   Options -Indexes
 </VirtualHost>
 
 
   Options -Indexes
 </VirtualHost>
 

-<Directory <%= @directory %>/html>
+<Directory <%= @directory %>>

   Require all granted
   Require all granted

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

 </Directory>
 </Directory>