Christian CouderIt is useless because --inetd implies --syslog.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- Documentation/everyday.txt | 4 ++-- Documentation/git-daemon.txt | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-)
Show changes to 2 files +4 −6
Documentation/everyday.txt, Documentation/git-daemon.txt
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt index b935c18..f1b2265 100644 --- a/Documentation/everyday.txt +++ b/Documentation/everyday.txt @@ -377,7 +377,7 @@ Run git-daemon to serve /pub/scm from in ------------ $ grep git /etc/inetd.conf git stream tcp nowait nobody \ - /usr/bin/git-daemon git-daemon --inetd --syslog --export-all /pub/scm + /usr/bin/git-daemon git-daemon --inetd --export-all /pub/scm ------------ + The actual configuration line should be on one line. @@ -397,7 +397,7 @@ service git wait = no user = nobody server = /usr/bin/git-daemon - server_args = --inetd --syslog --export-all --base-path=/pub/scm + server_args = --inetd --export-all --base-path=/pub/scm log_on_failure += USERID } ------------ diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index d562232..4b2ea2d 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -165,8 +165,7 @@ git-daemon as inetd server:: + ------------------------------------------------ git stream tcp nowait nobody /usr/bin/git-daemon - git-daemon --inetd --verbose - --syslog --export-all + git-daemon --inetd --verbose --export-all /pub/foo /pub/bar ------------------------------------------------ @@ -179,8 +178,7 @@ git-daemon as inetd server for virtual h + ------------------------------------------------ git stream tcp nowait nobody /usr/bin/git-daemon - git-daemon --inetd --verbose - --syslog --export-all + git-daemon --inetd --verbose --export-all --interpolated-path=/pub/%H%D /pub/www.example.org/software /pub/www.example.com/software
