X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1d475e5066342da04bd5492a70ad38ecdb02396f..89b4f69cf22dcd7ff06a83a0d901fd4c446675e9:/cookbooks/chef/templates/default/apache.erb

diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb
index 706ab5ead..917759a7c 100644
--- a/cookbooks/chef/templates/default/apache.erb
+++ b/cookbooks/chef/templates/default/apache.erb
@@ -5,7 +5,7 @@
 	ServerAlias chef.osm.org
 	ServerAdmin webmaster@openstreetmap.org
 
-	CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined
+	CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined_extended
 	ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 
 	RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
@@ -16,7 +16,7 @@
 	ServerName chef.openstreetmap.org
 	ServerAdmin webmaster@openstreetmap.org
 
-	CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined
+	CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined_extended
 	ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 
 	SSLEngine on
@@ -27,13 +27,4 @@
 	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>