spohr has /srv, and a /org is a symlink to it

[dsa-puppet.git] / modules / apache2 / templates / default-debian.org.erb

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 79533484adc5097843f5b62f1c4a373c472b9cc2..167c4fe6d1cde364e79f08433e2a4b81bd196128 100644 (file)
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -7,40 +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>
-"
-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 += "