X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=ea0fa67de973d1e2d4ec92456bbf4ab4b28a8146;hb=b85152452204fdacaa807997158c1980dcb26ebe;hp=ba55d93b3b38d33cdc1f92cfc58ab0dfd8901f1a;hpb=3ea3aea25101a514630219634a55b8fa9c55576e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index ba55d93b3..ea0fa67de 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -7,37 +7,19 @@
 	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 = ''
-if fqdn == "merkel.debian.org"
-  out = "
-        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>
-"
-else
-  out = "
+
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>
-"
-end
-out
-%>
+<% if hostname == "spohr" -%>
+        Alias /debian "/srv/mirrors/ftp.debian.org/ftp"
+<% end -%>
 </VirtualHost>
 # vim:set syn=apache: