X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/94db71c4cc23c8d77a0a3e8bbf13e5250485738b..760d6ef7a14a6bcd89804c10aa9b20775f1af3fc:/cookbooks/chef/templates/default/apache.erb

diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb
index 88684b82c..4f57bba7d 100644
--- a/cookbooks/chef/templates/default/apache.erb
+++ b/cookbooks/chef/templates/default/apache.erb
@@ -19,11 +19,18 @@
 	CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined
 	ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 
+	DocumentRoot /var/lib/git
+
 	SSLEngine on
 	SSLProxyEngine on
 	SSLCertificateFile /etc/ssl/certs/chef.openstreetmap.org.pem
 	SSLCertificateKeyFile /etc/ssl/private/chef.openstreetmap.org.key
 
+	ProxyPassMatch ^/.*\.git/ !
 	ProxyPass / https://<%= node[:fqdn] %>:4443/
 	ProxyPreserveHost on
 </VirtualHost>
+
+<Directory /var/lib/git>
+	Require ip <%= @git_allowed.sort.join(" ") %>
+</Directory>