X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=9f40d2a2e55c40527c3f4d8fe02365af0b63f01c;hb=250b44d39b2a25ab5785374b4fcb3c2afa07ad23;hp=b07bed535ec093d019ec2d5ea491c0bbf3e7ec81;hpb=b6e61d10b7da4322c7f03713608309104075ef0f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index b07bed535..9f40d2a2e 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -7,7 +7,7 @@
 	ServerAdmin debian-admin@debian.org
 
 	ErrorLog /var/log/apache2/error.log
-	CustomLog /var/log/apache2/access.log combined
+	CustomLog /var/log/apache2/access.log privacy
 
 	DocumentRoot /srv/www/default.debian.org/htdocs
 
@@ -16,21 +16,8 @@
 	ServerSignature On
 <%=
 out = case fqdn
-  when "merkel.debian.org"
-  then "
-        RemoveType .php .phtml .php3 .phps
-        php_admin_flag engine off
-        <Directory /home/don/public_html/cgi>
-                SetEnv PERLLIB \"/home/don/perl/usr/share/perl5:/home/don/source/\"
-                SetEnv DEBBUGS_CONFIG_FILE \"/home/don/config_internal\"
-                SetHandler cgi-script
-                AllowOverride None
-                Options +ExecCGI
-                Order allow,deny
-                Allow from all
-        </Directory>
-"
   when "master.debian.org" then ""
+  when "vento.debian.org" then ""
 else
 "
 	<IfModule mod_userdir.c>