From: mirai@makinata.eu
To: 60516@debbugs.gnu.org
Cc: Bruno Victal <mirai@makinata.eu>, me@tobias.gr
Subject: [bug#60516] [PATCH] services: git-daemon: Deprecate 'git-daemon-service' procedure.
Date: Tue, 3 Jan 2023 14:07:49 +0000 [thread overview]
Message-ID: <d32258e7415441ac17b38accc9a1d3aa834eca88.1672754645.git.mirai@makinata.eu> (raw)
From: Bruno Victal <mirai@makinata.eu>
* gnu/services/version-control.scm
(git-daemon-service): Define with 'define-deprecated'
* doc/guix.texi (Version Control Services): Replace with
'git-daemon-service-type'
---
doc/guix.texi | 25 +++++++++++--------------
gnu/services/version-control.scm | 4 +++-
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 5c85680831..552a403bcb 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -34838,27 +34838,24 @@ How often to run the node cleaning job. The default is once per day, at
The @code{(gnu services version-control)} module provides a service to
allow remote access to local Git repositories. There are three options:
-the @code{git-daemon-service}, which provides access to repositories via
+the @code{git-daemon-service-type}, which provides access to repositories via
the @code{git://} unsecured TCP-based protocol, extending the
@code{nginx} web server to proxy some requests to
@code{git-http-backend}, or providing a web interface with
@code{cgit-service-type}.
-@deffn {Scheme Procedure} git-daemon-service [#:config (git-daemon-configuration)]
-
-Return a service that runs @command{git daemon}, a simple TCP server to
+@defvar git-daemon-service-type
+Type for a service that runs @command{git daemon}, a simple TCP server to
expose repositories over the Git protocol for anonymous access.
-The optional @var{config} argument should be a
-@code{<git-daemon-configuration>} object, by default it allows read-only
-access to exported@footnote{By creating the magic file
-@file{git-daemon-export-ok} in the repository directory.} repositories under
-@file{/srv/git}.
-
-@end deffn
+The value for this service type is a @code{<git-daemon-configuration>}
+record, by default it allows read-only access to exported@footnote{By
+creating the magic file @file{git-daemon-export-ok} in the repository
+directory.} repositories under @file{/srv/git}.
+@end defvar
@deftp {Data Type} git-daemon-configuration
-Data type representing the configuration for @code{git-daemon-service}.
+Data type representing the configuration for @code{git-daemon-service-type}.
@table @asis
@item @code{package} (default: @code{git})
@@ -34895,8 +34892,8 @@ Whether to listen on an alternative port, which defaults to 9418.
If not empty, only allow access to this list of directories.
@item @code{extra-options} (default: @code{'()})
-Extra options will be passed to @command{git daemon}, please run
-@command{man git-daemon} for more information.
+Extra options that will be passed to @command{git daemon}.@footnote{Run
+@command{man git-daemon} for more information.}
@end table
@end deftp
diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm
index 86d40bdbe3..14ff0a59a6 100644
--- a/gnu/services/version-control.scm
+++ b/gnu/services/version-control.scm
@@ -29,6 +29,7 @@ (define-module (gnu services version-control)
#:use-module (gnu system shadow)
#:use-module (gnu packages version-control)
#:use-module (gnu packages admin)
+ #:use-module (guix deprecation)
#:use-module (guix records)
#:use-module (guix gexp)
#:use-module (guix store)
@@ -178,7 +179,8 @@ (define git-daemon-service-type
protocol.")
(default-value (git-daemon-configuration))))
-(define* (git-daemon-service #:key (config (git-daemon-configuration)))
+(define-deprecated (git-daemon-service #:key (config (git-daemon-configuration)))
+ git-daemon-service-type
"Return a service that runs @command{git daemon}, a simple TCP server to
expose repositories over the Git protocol for anonymous access.
base-commit: 473692b812b4ab4267d9bddad0fb27787d2112ff
--
2.38.1
next reply other threads:[~2023-01-03 14:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-03 14:07 mirai [this message]
2023-01-10 9:57 ` bug#60516: [PATCH] services: git-daemon: Deprecate 'git-daemon-service' procedure Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d32258e7415441ac17b38accc9a1d3aa834eca88.1672754645.git.mirai@makinata.eu \
--to=mirai@makinata.eu \
--cc=60516@debbugs.gnu.org \
--cc=me@tobias.gr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).