remove double slashes on metadata.ftp-master.debian.org

[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 285d008..5a060ce 100644 (file)
--- a/modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.ports.debian.org.erb
@@ -6,7 +6,9 @@
 <VirtualHost <%= vhost_listen %> >
         ServerAdmin debian-admin@debian.org
         ServerName ftp.ports.debian.org
-
+        <% if scope.function_onion_global_service_hostname(['ftp.ports.debian.org']) -%>
+        ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.ports.debian.org']) %>
+        <% end %>
 
         ErrorLog /var/log/apache2/ftp.ports.debian.org-error.log
         LogLevel warn
@@ -21,6 +23,7 @@
                 Options +Indexes
                 Options +FollowSymLinks
         </Directory>
+        Use ftp-archive /srv/mirrors/debian-ports
 
         Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
         <Directory /srv/mirrors/debian-ports-cd>
@@ -30,5 +33,3 @@
                 Options +FollowSymLinks
         </Directory>
 </VirtualHost>
-
-