Redirect / of openpgpkey to keyring.d.o

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

diff --git a/modules/roles/templates/apache-local-mirror.cdbuilder.debian.org.erb b/modules/roles/templates/apache-local-mirror.cdbuilder.debian.org.erb
index 91773e2..8ae527c 100644 (file)
--- a/modules/roles/templates/apache-local-mirror.cdbuilder.debian.org.erb
+++ b/modules/roles/templates/apache-local-mirror.cdbuilder.debian.org.erb
@@ -6,16 +6,18 @@
 <VirtualHost <%= @vhost_listen %>>
        ServerAdmin debian-admin@debian.org
        ServerName local-mirror.cdbuilder.debian.org
+       ServerAlias security.debian.org
+       ServerAlias deb.debian.org
        AddCharset UTF-8 .txt
 
        ErrorLog /var/log/apache2/local-mirror.cdbuilder.debian.org-error.log
        CustomLog /var/log/apache2/local-mirror.cdbuilder.debian.org-access.log privacy
 
        Use ftp-archive /srv/mirrors/debian
-       Alias /debian/ /srv/mirrors/debian
+       Alias /debian/ /srv/mirrors/debian/
 
        Use ftp-archive /srv/mirrors/debian-security
-       Alias /debian-security /srv/mirrors/debian-security
+       Alias /debian-security/ /srv/mirrors/debian-security/
 
        <IfModule mod_userdir.c>
                UserDir disabled