ssh-keygen on pg servers

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

diff --git a/modules/roles/templates/apache-archive.debian.org.erb b/modules/roles/templates/apache-archive.debian.org.erb
index 21bd9aa..84026e8 100644 (file)
--- a/modules/roles/templates/apache-archive.debian.org.erb
+++ b/modules/roles/templates/apache-archive.debian.org.erb
@@ -3,12 +3,23 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+<%
+  if not binds.kind_of?(Array)
+    raise Puppet::Error, "binds variable is not an array"
+  end
+
+  vhost_listen = binds.map{|x| x+":80" }.join(' ')
+%>
+
+
 <VirtualHost <%= vhost_listen %>>
        ServerAdmin debian-admin@debian.org
        ServerName archive.debian.org
        <% if scope.function_onion_global_service_hostname(['archive.debian.org']) -%>
        ServerAlias <%= scope.function_onion_global_service_hostname(['archive.debian.org']) %>
        <% end %>
+       ServerAlias archive.backend.mirrors.debian.org
+       ServerAlias *.archive.backend.mirrors.debian.org
 
        #RedirectMatch "^/$" /debian-archive/
        DocumentRoot <%= archive_root %>/
@@ -19,7 +30,6 @@
 
        <Directory <%= archive_root %>>
                Require all granted
-               IndexOptions NameWidth=*
                Options +Indexes +FollowSymLinks
        </Directory>