X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fapache-local-mirror.cdbuilder.debian.org.erb;h=8ae527c21ed336e66a2d0e78f247c037d35a9037;hb=a7d417cca7d5ad27c47c2c4627dae06c74b20222;hp=91773e24403f595964d7201a424a4d47c749673a;hpb=923f1c61472c907e7e10ec74655fd93fb6bcb56a;p=mirror%2Fdsa-puppet.git

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 91773e244..8ae527c21 100644
--- 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