[PATCH] Explain in --pid-file that using --inetd implies it automatically

[PATCH] Explain in --pid-file that using --inetd implies it automatically

[Jari Aalto]

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 Documentation/git-daemon.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index f902161..687deb2 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -124,7 +124,8 @@ OPTIONS
 	Detach from the shell. Implies --syslog.
 
 --pid-file=file::
-	Save the process id in 'file'.
+	Save the process id in 'file'. When `--inetd` is in use, this
+        option is not needed.
 
 --user=user, --group=group::
 	Change daemon's uid and gid before entering the service loop.
-- 
1.5.3.rc5

Available also from git repository http://cante.net/~jaalto/git/git

    Branch: Documentation/git-daemon.txt+option--pid-file

Re: [PATCH] Explain in --pid-file that using --inetd implies it automatically

[Junio C Hamano]

Jari Aalto <jari.aalto@cante.net> writes:

> diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
> index f902161..687deb2 100644
> --- a/Documentation/git-daemon.txt
> +++ b/Documentation/git-daemon.txt
> @@ -124,7 +124,8 @@ OPTIONS
>  	Detach from the shell. Implies --syslog.
>  
>  --pid-file=file::
> -	Save the process id in 'file'.
> +	Save the process id in 'file'. When `--inetd` is in use, this
> +        option is not needed.

Is it "is not needed"?  I think you meant to say "is ignored",
IOW, no pid file is written.

Which unfortunately makes the title of your patch wrong as
well X-<. 

I am not seriously suggesting to apply the following patch at
this point, but I think this is what we should have done from
the beginning.

diff --git a/daemon.c b/daemon.c
index 9cf22fe..a7b7990 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1143,8 +1143,8 @@ int main(int argc, char **argv)
 		usage(daemon_usage);
 	}
 
-	if (inetd_mode && (group_name || user_name))
-		die("--user and --group are incompatible with --inetd");
+	if (inetd_mode && (group_name || user_name || pid_file))
+		die("--user, --group and --pid-file are incompatible with --inetd");
 
 	if (inetd_mode && (listen_port || listen_addr))
 		die("--listen= and --port= are incompatible with --inetd");

Re: [PATCH] Explain in --pid-file that using --inetd implies it automatically

[Junio C Hamano]

Jari Aalto <jari.aalto@cante.net> writes:

> Junio C Hamano <gitster@pobox.com> writes:
>>> -	Save the process id in 'file'.
>>> +	Save the process id in 'file'. When `--inetd` is in use, this
>>> +        option is not needed.
>>
>> Is it "is not needed"?  I think you meant to say "is ignored",
>> IOW, no pid file is written.
>
> Corrected
>
>     git repository http://cante.net/~jaalto/git/git
>     Branch: git-daemon.txt+option--pid-file.collapse
>
>  Documentation/git-daemon.txt |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

Phuleeeze.  Try to apply what you sent out with "git am" and
watch the resulting commit log message in horrors!

Hint. "Documentation/SubmittingPatches".

Thanks.  I'll do this by hand so no need to resend.

>
> diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
> index f902161..861d68f 100644
> --- a/Documentation/git-daemon.txt
> +++ b/Documentation/git-daemon.txt
> @@ -124,7 +124,8 @@ OPTIONS
>         Detach from the shell. Implies --syslog.
>  
>  --pid-file=file::
> -       Save the process id in 'file'.
> +       Save the process id in 'file'. When `--inetd` is in use, this
> +        option is ignored.
>  
>  --user=user, --group=group::
>         Change daemon's uid and gid before entering the service loop.

Re: [PATCH] Explain in --pid-file that using --inetd implies it automatically

[Jari Aalto]

Junio C Hamano <gitster@pobox.com> writes:
>> -	Save the process id in 'file'.
>> +	Save the process id in 'file'. When `--inetd` is in use, this
>> +        option is not needed.
>
> Is it "is not needed"?  I think you meant to say "is ignored",
> IOW, no pid file is written.

Corrected

    git repository http://cante.net/~jaalto/git/git
    Branch: git-daemon.txt+option--pid-file.collapse

 Documentation/git-daemon.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index f902161..861d68f 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -124,7 +124,8 @@ OPTIONS
        Detach from the shell. Implies --syslog.
 
 --pid-file=file::
-       Save the process id in 'file'.
+       Save the process id in 'file'. When `--inetd` is in use, this
+        option is ignored.
 
 --user=user, --group=group::
        Change daemon's uid and gid before entering the service loop.

[PATCH] git-daemon(1): assorted improvements.

[Junio C Hamano]

Jari Aalto noticed a handful places in git-daemon documentation
that need to be improved.

 * --inetd makes --pid-file to be ignored, in addition to --user
   and --group

 * receive-pack service was not described at all.  We should, if
   only to warn about the security implications of it.

 * There was no example of per repository configuration.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

 * I'm planning to commit this one.

 Documentation/git-daemon.txt |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index f902161..efdcdad 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -124,7 +124,8 @@ OPTIONS
 	Detach from the shell. Implies --syslog.
 
 --pid-file=file::
-	Save the process id in 'file'.
+	Save the process id in 'file'.  Ignored when the daemon
+	is run under `--inetd`.
 
 --user=user, --group=group::
 	Change daemon's uid and gid before entering the service loop.
@@ -157,6 +158,13 @@ the facility of inet daemon to achieve the same before spawning
 SERVICES
 --------
 
+These services can be globally enabled/disabled using the
+command line options of this command.  If a finer-grained
+control is desired (e.g. to allow `git-archive` to be run
+against only in a few selected repositories the daemon serves),
+the per-repository configuration file can be used to enable or
+disable them.
+
 upload-pack::
 	This serves `git-fetch-pack` and `git-peek-remote`
 	clients.  It is enabled by default, but a repository can
@@ -164,7 +172,19 @@ upload-pack::
 	item to `false`.
 
 upload-archive::
-	This serves `git-archive --remote`.
+	This serves `git-archive --remote`.  It is disabled by
+	default, but a repository can enable it by setting
+	`daemon.uploadarchive` configuration item to `true`.
+
+receive-pack::
+	This serves `git-send-pack` clients, allowing anonymous
+	push.  It is disabled by default, as there is _no_
+	authentication in the protocol (in other words, anybody
+	can push anything into the repository, including removal
+	of refs).  This is solely meant for a closed LAN setting
+	where everybody is friendly.  This service can be
+	enabled by `daemon.receivepack` configuration item to
+	`true`.
 
 EXAMPLES
 --------
@@ -229,6 +249,18 @@ Repositories can still be accessed by hostname though, assuming
 they correspond to these IP addresses.
 
 
+To enable `git-archive --remote` and disable `git-fetch` against
+a repository, have the following in the configuration file in the
+repository (that is the file 'config' next to 'HEAD', 'refs' and
+'objects').
++
+----------------------------------------------------------------
+[daemon]
+	uploadpack = false
+	uploadarchive = true
+----------------------------------------------------------------
+
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki
-- 
1.5.3.rc7