X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=dff8a4ffe1b516291897aff2d0995d5925f935c5;hb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;hp=79533484adc5097843f5b62f1c4a373c472b9cc2;hpb=52b3c438e1c717aeabf3fc781c5c3bd78a015f6f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 79533484a..dff8a4ffe 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -7,55 +7,21 @@
 	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
+	<% if @lsbmajdistrelease > '7' -%>
+	<Directory /srv/www/default.debian.org/htdocs>
+		Require all granted
+	</Directory>
+	<% end -%>
 
 	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\"
-"
-  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: