Disable squid_delay_pools munin plugins

[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 4f57bba7de7ca2d6844cba5a076082803216fb9f..9d86d910e7c858b4ccdfdd3b9e71391e8c8a7705 100644 (file)
--- a/cookbooks/chef/templates/default/apache.erb
+++ b/cookbooks/chef/templates/default/apache.erb
@@ -19,8 +19,6 @@
        CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 
        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
        SSLEngine on
        SSLProxyEngine on
        SSLCertificateFile /etc/ssl/certs/chef.openstreetmap.org.pem


@@ -30,7 +28,3 @@
        ProxyPass / https://<%= node[:fqdn] %>:4443/
        ProxyPreserveHost on
 </VirtualHost>
        ProxyPass / https://<%= node[:fqdn] %>:4443/
        ProxyPreserveHost on
 </VirtualHost>

-
-<Directory /var/lib/git>
-       Require ip <%= @git_allowed.sort.join(" ") %>
-</Directory>