And set net.ifnames to 0

[mirror/dsa-puppet.git] / modules / roles / templates / apache-ftp.ports.debian.org.erb

diff --git a/modules/roles/templates/apache-ftp.ports.debian.org.erb b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index 778b6cc..a9d4058 100644 (file)
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -3,7 +3,7 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%= @vhost_listen %> >
        ServerAdmin debian-admin@debian.org
        ServerName ftp.ports.debian.org
        <% if scope.function_onion_global_service_hostname(['ftp.ports.debian.org']) -%>
@@ -21,9 +21,12 @@
        Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
        <Directory /srv/mirrors/debian-ports-cd>
                Require all granted
-               IndexOptions NameWidth=* +SuppressDescription
                Options +Indexes
                Options +FollowSymLinks
        </Directory>
+
+       <IfModule mod_userdir.c>
+               UserDir disabled
+       </IfModule>
 </VirtualHost>
 # vim:set syn=apache: