[snapshot/master] fix http git stuff

[Peter Palfrader <peter@palfrader.org>]

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

diff --git a/etc/apache.conf b/etc/apache.conf
index eb9e129..de114bf 100644
--- a/etc/apache.conf
+++ b/etc/apache.conf
@@ -14,20 +14,14 @@ WSGIDaemonProcess snapshot.debian.org user=nobody group=nogroup home=/ processes
   Alias /robots.txt  /srv/snapshot.debian.org/web/public/robots.txt
 
   #Alias /git         /srv/snapshot.debian.org/snapshot.git
-  SetEnv GIT_PROJECT_ROOT /srv/snapshot.debian.org/snapshot.git
-  AliasMatch ^/git/(objects/[0-9a-f]{2}/[0-9a-f]{38})$          /srv/snapshot.debian.org/snapshot.git/$1
-  AliasMatch ^/git/(objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /srv/snapshot.debian.org/snapshot.git/$1
-  ScriptAlias /git/ /usr/lib/git-core/git-http-backend/
-
-  # mirrorrun dumps
-  SetEnv GIT_PROJECT_ROOT /srv/snapshot.debian.org/dumps-git/.git
-  AliasMatch ^/dumps.git/(objects/[0-9a-f]{2}/[0-9a-f]{38})$          /srv/snapshot.debian.org/dumps-git/.git/$1
-  AliasMatch ^/dumps.git/(objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /srv/snapshot.debian.org/dumps-git/.git/$1
-  ScriptAlias /dumps.git/ /usr/lib/git-core/git-http-backend/
-
+  SetEnv GIT_PROJECT_ROOT /srv/snapshot.debian.org/all-git
+  AliasMatch ^/gits/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$          /srv/snapshot.debian.org/all-git/$1
+  AliasMatch ^/gits/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /srv/snapshot.debian.org/all-git/$1
+  ScriptAlias /gits/ /usr/lib/git-core/git-http-backend/
 
   RewriteEngine on
   RewriteRule ^/archive/backports.org/(.*) /archive/debian-backports/$1 [L,R]
+  RewriteRule ^/git/(.*) /gits/snapshot.git/$1 [PT]
 
   <Directory /srv/snapshot.debian.org/htdocs>
     Order allow,deny
-- 
1.7.2.5