Disable userdir on a bunch of vhosts

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 d41efba..eeafe39 100644 (file)
--- 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 41431f2..bcc57d6 100644 (file)
--- 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 576eec0..f2bbeec 100644 (file)
--- 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 778b6cc..90cbbba 100644 (file)
--- 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: