From: Martin Zobel-Helas <zobel@debian.org>
Date: Mon, 22 Apr 2013 20:57:48 +0000 (+0200)
Subject: remove UserDir from master and vento
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6db79c9107569829cb1a320a49bd0b2022983b61;p=mirror%2Fdsa-puppet.git

remove UserDir from master and vento
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 9f40d2a2e..861e0e3af 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -14,17 +14,11 @@
 	HostnameLookups Off
 	UseCanonicalName Off
 	ServerSignature On
-<%=
-out = case fqdn
-  when "master.debian.org" then ""
-  when "vento.debian.org" then ""
-else
-"
+
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>
-"
-end
+<%=
 case fqdn
   when "spohr.debian.org" then
     out += "