X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=167c4fe6d1cde364e79f08433e2a4b81bd196128;hb=ab25358b289f23003b7b992f926011e5f46bcc6e;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..167c4fe6d 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -7,41 +7,22 @@
 	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
 
 	HostnameLookups Off
 	UseCanonicalName Off
 	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 ""
-else
-"
+
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>
-"
-end
+<%=
 case fqdn
   when "spohr.debian.org" then
     out += "
-        Alias /debian \"/org/mirrors/ftp.debian.org/ftp\"
+        Alias /debian \"/srv/mirrors/ftp.debian.org/ftp\"
 "
   when "piatti.debian.org" then
     out += "