Note what the git-upload-pack userv service needs to do

[userv-utils.git] / git-daemon / git-daemon-vhosts.pl

diff --git a/git-daemon/git-daemon-vhosts.pl b/git-daemon/git-daemon-vhosts.pl
index 4c6fb62d76d84d950270c3a366fd944cf6e796a4..7c37b7a57e2082adc3d3f45aa2aee8aeffe83a80 100644 (file)
--- a/git-daemon/git-daemon-vhosts.pl
+++ b/git-daemon/git-daemon-vhosts.pl
@@ -8,24 +8,32 @@
 #      git://HOSTNAME/REPO.git
 #      git://HOSTNAME/~TILDE/REPO.git
 
+$HOSTNAME = qr{[-.0-9a-z]+};
+$TILDE    = qr{[0-9a-z]+};
+$REPO     = qr{[-+._0-9A-Za-z]+};
+
 # The vhost_default_user hash specifies what user handles git requests
 # for each virtual host, if the URL does not have a tilde part, or if
-# the virtual host does not appear in the vhost_user_from_tilde hash.
-# If a virtual host does not appear in this hash then URLs without a
-# tilde part are forbidden for that virtual host.
+# the virtual hosts does not appear in either vhost_tilde hash. If a
+# virtual host does not appear in this hash then it does not permit
+# URLs without tilde parts.
 
 %vhost_default_user = (
        'dotat.at' => 'fanf',
 );
 
-# The vhost_user_from_tilde hash lists which virtual hosts allow the
-# tilde part to specify the user that should handle the request. If a
-# virtual host is not present in this hash then its default user
-# handles all requests. If a virtual host is not present in either map
-# then no requests are permitted.
+# The vhost_tilde_is_user hash specifies which virtual hosts use the
+# tilde part of a URL to specify the user that handles the request.
 
-%vhost_user_from_tilde = (
+%vhost_tilde_is_user = (
        'chiark.greenend.org.uk' => 1,
 );
 
+# The vhost_tilde_forbidden hash specifies which virtual hosts do not
+# permit URLs with tilde parts.
+
+%vhost_tilde_forbidden = (
+       'dotat.at' => 1,
+);
+
 # end