Remove wheezy-supporting cruft

[mirror/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 b07bed5..da10107 100644 (file)
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -7,56 +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
+       <Directory /srv/www/default.debian.org/htdocs>
+               Require all granted
+       </Directory>
 
        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\"
-"
-  when "piatti.debian.org" then
-    out += "
-       # for piuparts, RT#1218
-       Alias /debian/ \"/org/mirrors/ftp.debian.org/ftp/\"
-       <Directory \"/org/mirrors/ftp.debian.org/ftp/\">
-               Options Indexes MultiViews FollowSymLinks
-               AllowOverride None
-               Order deny,allow
-               Deny from all
-               Allow from 127.0.0.0/255.0.0.0 ::1/128 193.167.161.225/32
-       </Directory>
-"
-end
-out
-%>
 </VirtualHost>
 # vim:set syn=apache: