Skip to content

Commit

Permalink
git-daemon(1): don't assume git-daemon is in /usr/bin
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
Jonathan Nieder authored and gitster committed Jul 2, 2008
1 parent 3861cd5 commit 963a653
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Documentation/git-daemon.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------------------------------------------

Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 963a653

Please sign in to comment.