[snapshot/master] take over snapshot.debian.net domain

[Peter Palfrader <peter@palfrader.org>]

---
 etc/apache.conf |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/etc/apache.conf b/etc/apache.conf
index de114bf..4839a0f 100644
--- a/etc/apache.conf
+++ b/etc/apache.conf
@@ -4,7 +4,7 @@ WSGIDaemonProcess snapshot.debian.org user=nobody group=nogroup home=/ processes
 
 <VirtualHost *:80>
   ServerName snapshot.debian.org
-  ServerAlias snapshot-dev.debian.org snapshot-master.debian.org snapshot-*.debian.org
+  ServerAlias snapshot-dev.debian.org snapshot-master.debian.org snapshot-*.debian.org snapshot.debian.net
   ServerAdmin team@snapshot.debian.org
 
   ErrorLog  /var/log/apache2/snapshot.debian.org-error.log
@@ -23,6 +23,10 @@ WSGIDaemonProcess snapshot.debian.org user=nobody group=nogroup home=/ processes
   RewriteRule ^/archive/backports.org/(.*) /archive/debian-backports/$1 [L,R]
   RewriteRule ^/git/(.*) /gits/snapshot.git/$1 [PT]
 
+  RewriteCond  %{HTTP_HOST} ^snapshot.debian.net$
+  RewriteRule ^/(.*)$ http://snapshot.debian.org/ [R]
+
+
   <Directory /srv/snapshot.debian.org/htdocs>
     Order allow,deny
     Allow from all
-- 
1.7.2.5