summaryrefslogtreecommitdiff
path: root/Documentation/git-daemon.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-29 10:32:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-29 10:32:12 (GMT)
commitbdd7379566cf7b1f1c9bfe42e794c8f1821971f7 (patch)
tree6f7d19adaf2ae1c9f5193663ab54ef9f6f58dfad /Documentation/git-daemon.txt
parent99c7ff35257886df349eafd7a370a1d530d731ec (diff)
downloadgit-bdd7379566cf7b1f1c9bfe42e794c8f1821971f7.zip
git-bdd7379566cf7b1f1c9bfe42e794c8f1821971f7.tar.gz
git-bdd7379566cf7b1f1c9bfe42e794c8f1821971f7.tar.bz2
git-daemon(1): assorted improvements.
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>
Diffstat (limited to 'Documentation/git-daemon.txt')
-rw-r--r--Documentation/git-daemon.txt36
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