Re: [v6 PATCH] daemon: add systemd support

[Eric Sunshine <sunshine@sunshineco.com>]

On Mon, Apr 6, 2015 at 10:03 PM, Shawn Landden <shawn@churchofgit.com> wrote:
> systemd supports git-daemon's existing --inetd mode as well.
> --systemd allows git-daemon has the advantage of allowing one git-daemon
> to listen to multiple interfaces as well as the system one(s),
> and more allow git-daemon to not be spawned on every connection.

The commit message is much better than previous versions, although, it
fails to parse cleanly and does not seem to have been proof-read. The
first sentence still feels as if its unrelated to the rest of the
commit message, however, prefixing it with "although" helps. Perhaps
something like this:

    Although "git-daemon --inetd" works with systemd, a proper
    "git-daemon --systemd" mode has the advantage of ... listening
    on multiple interfaces, ..., does not require spawning a new
    git-daemon instance for each connection, ...

Fill in the "..." with whatever other benefits a --systemd mode might
provide (if any).

> Signed-off-by: Shawn Landden <shawn@churchofgit.com>
> ---
> diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
> index a69b361..3a7a0b1 100644
> --- a/Documentation/git-daemon.txt
> +++ b/Documentation/git-daemon.txt
> @@ -304,7 +313,35 @@ selectively enable/disable services per repository::
>                 uploadpack = false
>                 uploadarch = true
>  ----------------------------------------------------------------
> ++

As mentioned in the last couple reviews, you should replace the above
"+" line with a blank line since the "systemd configuration example"
item is not a continuation of the preceding "selectively
enable/disable services per repository" item.

> +systemd configuration example::
> +Example systemd configuration files, typically placed in `/etc/systemd/system`.
> ++
> +`git-daemon.socket`
> ++
> +----------------------------------------------------------------
> +# /etc/systemd/system/git-daemon.socket

This comment line merely repeats the filename outside of the verbatim
block, thus can be dropped.

> +[Unit]
> +Description=Git Daemon socket
> +
> +[Socket]
> +ListenStream=9418
> +
> +[Install]
> +WantedBy=sockets.target
> +----------------------------------------------------------------
> ++
> +`git-daemon.service`
> ++
> +----------------------------------------------------------------
> +[Unit]
> +Description=Git Daemon
>
> +[Service]
> +ExecStart=/usr/lib/git-core/git-daemon --systemd --reuseaddr --base-path=/var/lib /var/lib/git
> +User=git-daemon
> +StandardError=null
> +----------------------------------------------------------------
>
>  ENVIRONMENT
>  -----------