X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=131f0218d0ca29003c91875f8bdc270cf655cbea;hb=89bb1a2bdf42ecd9535e20f19c0d71d8372ec7dd;hp=b07bed535ec093d019ec2d5ea491c0bbf3e7ec81;hpb=6492ddd94a7ca8f8e63d63a046af694d6f4bd0e8;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..131f0218d 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -16,21 +16,8 @@
ServerSignature On
<%=
out = case fqdn
- when "merkel.debian.org"
- then "
- RemoveType .php .phtml .php3 .phps
- php_admin_flag engine off
-
- 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
-
-"
when "master.debian.org" then ""
+ when "vento.debian.org" then ""
else
"