X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=blobdiff_plain;f=git-daemon%2Fgit-urlmap;h=a72b48c9bebe30173d2e00d076039be9e2509e24;hp=61c376cbe9328f4dfc340acb63e825ffa4350202;hb=82e04925eb9e251fb56c507967fe1ff76e59c94c;hpb=3fc5563cc0f31659d09a6cdfd0fd1c7fdb6ed85d

diff --git a/git-daemon/git-urlmap b/git-daemon/git-urlmap
index 61c376c..a72b48c 100644
--- a/git-daemon/git-urlmap
+++ b/git-daemon/git-urlmap
@@ -1,27 +1,48 @@
-# Example configuration file for the userv git daemon.
+# Configuration file for the userv git daemon.
 #
 # This was written by Tony Finch <dot@dotat.at>
 # You may do anything with it, at your own risk.
 # http://creativecommons.org/publicdomain/zero/1.0/
+#
+# This is a perl script which is expected to turn the information
+# found in the request variables into the location of the
+# corresponding repository, which it stores in the output variables.
+# Some information about the network connection is also available.
+#
+# REQUEST VARIABLES
+#  $service - normally "git-upload-pack"
+#    `git daemon --help` describes other possible services
+#  $host
+#  $path
+#  $uri     = git://$host/$path
+#  $_       = $uri
+#
+# OUTPUT VARIABLES
+#  $user - who runs the service
+#  $dir  - may be:
+#    * an absolute path
+#    * a path relative to the user's home directory
+#    * equivalently, a path starting ~/
+#  $repo - if set, the repository's path is $dir/$repo
+#          otherwise, the repository's path is just $dir
+#  $check_export - whether to check for a git-daemon-export-ok file
+#                  (default false)
+#  $check_repo   - whether to restrict the syntax of $repo
+#                  (default true)
+#  @opts - options for the service command
+#
+# CONNECTION VARIABLES
+#  $client_addr
+#  $client_port
+#  $client      = [$client_addr]:$client_port
+#  $server_addr
+#  $server_port
+#  $server      = [$server_addr]:$server_port
 
-if ($host eq 'git.chiark.greenend.org.uk') {
-    if ($path =~ m{^~([^/]*)/(.*)}) {
-        $user = $1;
-        $dir = 'public-git';
-        $repo = $2;
-    } else {
-        $user = 'webmaster';
-        $dir = '/u2/git-repos';
-        $repo = $path;
-    }
-} elsif (m{^git://cabal[.]greenend[.]org[.]uk/~([^/]*)/(.*)$}) {
+if ($path =~ m{^~([^/]*)/(.*)}) {
     $user = $1;
-    $dir = 'cabal-git';
-    $repo = $2;
-} elsif ($host eq 'dotat.at') {
-    $user = 'fanf';
     $dir = 'public-git';
-    $repo = $path;
+    $repo = $2;
 }
 
 # end