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 373c63af276c800ccc7c110c52c8eb0bf0bbeedc..5b2e320d693d5720008ec86654da3bdd259c045d 100644 (file)
--- a/cookbooks/dmca/templates/default/apache.erb
+++ b/cookbooks/dmca/templates/default/apache.erb
@@ -44,13 +44,15 @@
   CustomLog /var/log/apache2/<%= @name %>-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
-  DocumentRoot <%= @directory %>/html
+  DocumentRoot <%= @directory %>
 
   Options -Indexes
-
-  ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir=<%= @directory %>/html/:/usr/share/php/:/tmp/\ndisable_functions=exec,shell_exec,system,passthru,popen"
 </VirtualHost>
 
-<Directory <%= @directory %>/html>
+<Directory <%= @directory %>>
   Require all granted
+
+  <FilesMatch ".+\.ph(ar|p|tml)$">
+    SetHandler "proxy:unix:/run/php/php-<%= @name %>-fpm.sock|fcgi://127.0.0.1"
+  </FilesMatch>
 </Directory>