X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ac7b87133f56d8f338d80e9a6880c80b676ab779..c1f9bd14428e5b4f78524150c1d1eece729828f2:/cookbooks/dmca/templates/default/apache.erb

diff --git a/cookbooks/dmca/templates/default/apache.erb b/cookbooks/dmca/templates/default/apache.erb
index 672a1be3e..d59bb7e22 100644
--- a/cookbooks/dmca/templates/default/apache.erb
+++ b/cookbooks/dmca/templates/default/apache.erb
@@ -44,15 +44,19 @@
   CustomLog /var/log/apache2/<%= @name %>-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
-  DocumentRoot <%= @directory %>/html
+  DocumentRoot <%= @directory %>
 
   Options -Indexes
 </VirtualHost>
 
-<Directory <%= @directory %>/html>
+<Directory <%= @directory %>>
   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>
+
+<Directory ~ "\.git">
+  Require all denied
+</Directory>