From: Jonathan Nieder Date: Mon, 30 Jun 2008 22:15:57 +0000 (-0500) Subject: git-daemon(1): don't assume git-daemon is in /usr/bin X-Git-Tag: v1.6.0-rc0~168 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=963a653fa635c6b07ed399b2fafca2a4d7866a21;p=git.git git-daemon(1): don't assume git-daemon is in /usr/bin In the example inetd.conf lines in git-daemon(1), it was assumed that `git-daemon` resides in the user's /usr/bin. With this patch, we only assume `git` is in /usr/bin. The stronger assumption fails in the default installation nowadays. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 344f24ea5..b71eb94d5 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -206,8 +206,8 @@ git-daemon as inetd server:: /etc/inetd all on one line: + ------------------------------------------------ - git stream tcp nowait nobody /usr/bin/git-daemon - git-daemon --inetd --verbose --export-all + git stream tcp nowait nobody /usr/bin/git + git daemon --inetd --verbose --export-all /pub/foo /pub/bar ------------------------------------------------ @@ -219,8 +219,8 @@ git-daemon as inetd server for virtual hosts:: `/etc/inetd` all on one line: + ------------------------------------------------ - git stream tcp nowait nobody /usr/bin/git-daemon - git-daemon --inetd --verbose --export-all + git stream tcp nowait nobody /usr/bin/git + git daemon --inetd --verbose --export-all --interpolated-path=/pub/%H%D /pub/www.example.org/software /pub/www.example.com/software @@ -241,7 +241,7 @@ git-daemon as regular daemon for virtual hosts:: their IP addresses, start the daemon like this: + ------------------------------------------------ - git-daemon --verbose --export-all + git daemon --verbose --export-all --interpolated-path=/pub/%IP/%D /pub/192.168.1.200/software /pub/10.10.220.23/software