From 1d8c0fff258e85baf1513c319c79fbebbf108fcc Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 1 Feb 2017 08:27:38 +0100
Subject: [PATCH] Disable userdir on a bunch of vhosts

---
 .../roles/templates/apache-cdimage-search.debian.org.conf.erb | 4 ++++
 modules/roles/templates/apache-debug.mirrors.debian.org.erb   | 4 ++++
 modules/roles/templates/apache-ftp.debian.org.erb             | 4 ++++
 modules/roles/templates/apache-ftp.ports.debian.org.erb       | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/modules/roles/templates/apache-cdimage-search.debian.org.conf.erb b/modules/roles/templates/apache-cdimage-search.debian.org.conf.erb
index d41efba88..eeafe393b 100644
--- a/modules/roles/templates/apache-cdimage-search.debian.org.conf.erb
+++ b/modules/roles/templates/apache-cdimage-search.debian.org.conf.erb
@@ -24,6 +24,10 @@
 
 	RewriteEngine On
 	RewriteRule ^/$ /cgi-bin/find_file.cgi [PT]
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
 </Macro>
 
 Use common-debian-service-https-redirect * cdimage-search.debian.org
diff --git a/modules/roles/templates/apache-debug.mirrors.debian.org.erb b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
index 41431f2a7..bcc57d6bd 100644
--- a/modules/roles/templates/apache-debug.mirrors.debian.org.erb
+++ b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
@@ -17,5 +17,9 @@
 	CustomLog /var/log/apache2/debug.mirrors.debian.org-access.log privacy
 
 	Use ftp-archive /srv/mirrors/debian-debug
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
 </VirtualHost>
 # vim:set syn=apache:
diff --git a/modules/roles/templates/apache-ftp.debian.org.erb b/modules/roles/templates/apache-ftp.debian.org.erb
index 576eec0fa..f2bbeec9f 100644
--- a/modules/roles/templates/apache-ftp.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.debian.org.erb
@@ -17,6 +17,10 @@
 	CustomLog /var/log/apache2/ftp.debian.org-access.log privacy
 
 	Use ftp-archive <%= archive_root %>
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
 </VirtualHost>
 
 # vim:set syn=apache:
diff --git a/modules/roles/templates/apache-ftp.ports.debian.org.erb b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index 778b6ccca..90cbbbab3 100644
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -25,5 +25,9 @@
 		Options +Indexes
 		Options +FollowSymLinks
 	</Directory>
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
 </VirtualHost>
 # vim:set syn=apache:
-- 
2.20.1