Update taginfo package list for Ubuntu 18.04 compatibility

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

diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb
index 1fb417fcb50374ee682090e19e2e6f814b30af78..706ab5eadc9f9d754d2df3f9619cc094f071b728 100644 (file)
--- a/cookbooks/chef/templates/default/apache.erb
+++ b/cookbooks/chef/templates/default/apache.erb
@@ -24,5 +24,16 @@
        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
+
+       SetEnv GIT_PROJECT_ROOT /var/lib/git
+       SetEnv GIT_HTTP_EXPORT_ALL
+       ScriptAlias / /usr/lib/git-core/git-http-backend/
 </VirtualHost>
+
+<Directory /usr/lib/git-core>
+       Options ExecCGI
+       Require ip <%= @git_allowed.sort.join(" ") %>
+</Directory>