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 <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
3861cd5582
commit
963a653fa6
@ -206,8 +206,8 @@ git-daemon as inetd server::
|
|||||||
/etc/inetd all on one line:
|
/etc/inetd all on one line:
|
||||||
+
|
+
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
git stream tcp nowait nobody /usr/bin/git-daemon
|
git stream tcp nowait nobody /usr/bin/git
|
||||||
git-daemon --inetd --verbose --export-all
|
git daemon --inetd --verbose --export-all
|
||||||
/pub/foo /pub/bar
|
/pub/foo /pub/bar
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
|
|
||||||
@ -219,8 +219,8 @@ git-daemon as inetd server for virtual hosts::
|
|||||||
`/etc/inetd` all on one line:
|
`/etc/inetd` all on one line:
|
||||||
+
|
+
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
git stream tcp nowait nobody /usr/bin/git-daemon
|
git stream tcp nowait nobody /usr/bin/git
|
||||||
git-daemon --inetd --verbose --export-all
|
git daemon --inetd --verbose --export-all
|
||||||
--interpolated-path=/pub/%H%D
|
--interpolated-path=/pub/%H%D
|
||||||
/pub/www.example.org/software
|
/pub/www.example.org/software
|
||||||
/pub/www.example.com/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:
|
their IP addresses, start the daemon like this:
|
||||||
+
|
+
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
git-daemon --verbose --export-all
|
git daemon --verbose --export-all
|
||||||
--interpolated-path=/pub/%IP/%D
|
--interpolated-path=/pub/%IP/%D
|
||||||
/pub/192.168.1.200/software
|
/pub/192.168.1.200/software
|
||||||
/pub/10.10.220.23/software
|
/pub/10.10.220.23/software
|
||||||
|
Loading…
Reference in New Issue
Block a user