X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=84f4533e2206388193ab917ce01601c4ff839b8f;hb=85d5f347a5fda6ba552e40090869bdb7b8b56fef;hp=0d2159cc762791b618166af678396ff605b76155;hpb=fa78ccb5449b0ad1aac9df21b3b20a9b389109bc;p=mirror%2Fdsa-puppet.git
diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 0d2159cc7..84f4533e2 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -16,20 +16,7 @@
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 ""
else
"