X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/760d6ef7a14a6bcd89804c10aa9b20775f1af3fc..e92ed5e09215d67f2bd7dc21a32425d7ec5aa26f:/cookbooks/chef/templates/default/apache.erb diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb index 4f57bba7d..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,11 +16,9 @@ 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 - DocumentRoot /var/lib/git - SSLEngine on SSLProxyEngine on SSLCertificateFile /etc/ssl/certs/chef.openstreetmap.org.pem @@ -30,7 +28,3 @@ ProxyPass / https://<%= node[:fqdn] %>:4443/ ProxyPreserveHost on - - - Require ip <%= @git_allowed.sort.join(" ") %> -