GNU logs - #71722, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#71722] [PATCH 0/2] services: Update agate-service-type to match actual agate options
Resent-From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 22 Jun 2024 19:07:02 +0000
Resent-Message-ID: <handler.71722.B.17190831671647 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 71722 <at> debbugs.gnu.org
Cc: Rodion Goritskov <rodion.goritskov@HIDDEN>
From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Date: Sat, 22 Jun 2024 23:03:48 +0400
Message-ID: <cover.1719082137.git.rodion.goritskov@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::32e;
 envelope-from=rodion.goritskov@HIDDEN; helo=mail-wm1-x32e.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

Hello!

This patches makes agate-service-type work again - because current version of agate present
in Guix has some options (and their logic) changed, making service-type not working.

I have checked this changes on VM and they seems to be working fine.

Rodion Goritskov (2):
  services: agate: Update options for compatibility with the current
    Agate version.
  services: agate-service-type: Update documentation.

 doc/guix.texi        | 51 +++++++++++++++++++++++++++-----------------
 gnu/services/web.scm | 50 ++++++++++++++++++++++++++-----------------
 2 files changed, 63 insertions(+), 38 deletions(-)


base-commit: 1e336025957583fd978df49a24c6a1bb358c618d
-- 
2.45.1

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Rodion Goritskov <rodion.goritskov@HIDDEN>
Subject: bug#71722: Acknowledgement ([PATCH 0/2] services: Update
 agate-service-type to match actual agate options)
Message-ID: <handler.71722.B.17190831671647.ack <at> debbugs.gnu.org>
References: <cover.1719082137.git.rodion.goritskov@HIDDEN>
X-Gnu-PR-Message: ack 71722
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 71722 <at> debbugs.gnu.org
Date: Sat, 22 Jun 2024 19:07:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 71722 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
71722: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D71722
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix-patches@HIDDEN:

Subject: [bug#71722] [PATCH 1/2] services: agate: Update options for compatibility with the current Agate version.
Resent-From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 22 Jun 2024 19:37:02 +0000
Resent-Message-ID: <handler.71722.B71722.17190849885384 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 71722 <at> debbugs.gnu.org
Cc: Rodion Goritskov <rodion.goritskov@HIDDEN>
From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Date: Sat, 22 Jun 2024 23:33:54 +0400
Message-ID: <258b03236418dc733802f4834f02565755063e76.1719082137.git.rodion.goritskov@HIDDEN>
In-Reply-To: <cover.1719082137.git.rodion.goritskov@HIDDEN>
References: <cover.1719082137.git.rodion.goritskov@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

* gnu/services/web.scm (<agate-configuration>)[certs]: Add.
* gnu/services/web.scm (<agate-configuration>)[cert]: Remove.
* gnu/services/web.scm (<agate-configuration>)[key]: Remove.
* gnu/services/web.scm (<agate-configuration>)[hostname]: Change from string
to list.
* gnu/services/web.scm (<agate-configuration>)[silent?]: Remove.
* gnu/services/web.scm (<agate-configuration>)[only-tls13?]: Add.
* gnu/services/web.scm (<agate-configuration>)[central-conf?]: Add.
* gnu/services/web.scm (<agate-configuration>)[ed25519?]: Add.
* gnu/services/web.scm (<agate-configuration>)[skip-port-check?]: Add.
* gnu/services/web.scm (agate-shepherd-service): Change handling of addr and
hostname, add new options handling.

Change-Id: Ibc83a7254d1e425604d4aa0b95cbaa74fc9c72eb
---
 gnu/services/web.scm | 50 +++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 406117c457..1ee1fff9ed 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -302,13 +302,15 @@ (define-module (gnu services web)
             agate-configuration?
             agate-configuration-package
             agate-configuration-content
-            agate-configuration-cert
-            agate-configuration-key
+            agate-configuration-certs
             agate-configuration-addr
             agate-configuration-hostname
             agate-configuration-lang
-            agate-configuration-silent
+            agate-configuration-only-tls13
             agate-configuration-serve-secret
+            agate-configuration-central-conf
+            agate-configuration-ed25519
+            agate-configuration-skip-port-check
             agate-configuration-log-ip
             agate-configuration-user
             agate-configuration-group
@@ -2177,20 +2179,24 @@ (define-record-type* <agate-configuration>
             (default agate))
   (content  agate-configuration-content
             (default "/srv/gemini"))
-  (cert     agate-configuration-cert
-            (default #f))
-  (key      agate-configuration-key
-            (default #f))
+  (certs     agate-configuration-certs
+             (default "/srv/gemini-certs"))
   (addr     agate-configuration-addr
             (default '("0.0.0.0:1965" "[::]:1965")))
   (hostname agate-configuration-hostname
-            (default #f))
+            (default '()))
   (lang     agate-configuration-lang
             (default #f))
-  (silent?  agate-configuration-silent
-            (default #f))
+  (only-tls13? agate-configuration-only-tls13
+               (default #f))
   (serve-secret? agate-configuration-serve-secret
                  (default #f))
+  (central-conf? agate-configuration-central-conf
+                 (default #f))
+  (ed25519? agate-configuration-ed25519
+            (default #f))
+  (skip-port-check? agate-configuration-skip-port-check
+                    (default #f))
   (log-ip?  agate-configuration-log-ip
             (default #t))
   (user     agate-configuration-user
@@ -2202,8 +2208,10 @@ (define-record-type* <agate-configuration>
 
 (define agate-shepherd-service
   (match-lambda
-    (($ <agate-configuration> package content cert key addr
-                              hostname lang silent? serve-secret?
+    (($ <agate-configuration> package content certs addr
+                              hostname lang only-tls13?
+                              serve-secret? central-conf?
+                              ed25519? skip-port-check?
                               log-ip? user group log-file)
      (list (shepherd-service
             (provision '(agate))
@@ -2213,17 +2221,21 @@ (define agate-shepherd-service
                      #~(make-forkexec-constructor
                         (list #$agate
                               "--content" #$content
-                              "--cert" #$cert
-                              "--key" #$key
-                              "--addr" #$@addr
+                              "--certs" #$certs
+                              #$@(append-map
+                                  (lambda x (append '("--addr") x))
+                                  addr)
+                              #$@(append-map
+                                  (lambda x (append '("--hostname") x))
+                                  hostname)
                               #$@(if lang
                                      (list "--lang" lang)
                                      '())
-                              #$@(if hostname
-                                     (list "--hostname" hostname)
-                                     '())
-                              #$@(if silent? '("--silent") '())
                               #$@(if serve-secret? '("--serve-secret") '())
+                              #$@(if only-tls13? '("--only-tls13") '())
+                              #$@(if central-conf? '("--central-conf") '())
+                              #$@(if ed25519? '("--ed25519") '())
+                              #$@(if skip-port-check? '("--skip-port-check") '())
                               #$@(if log-ip? '("--log-ip") '()))
                         #:user #$user #:group #$group
                         #:log-file #$log-file)))
-- 
2.45.1

Message sent to guix-patches@HIDDEN:

Subject: [bug#71722] [PATCH 2/2] services: agate-service-type: Update documentation.
Resent-From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 22 Jun 2024 19:37:02 +0000
Resent-Message-ID: <handler.71722.B71722.17190849995413 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 71722 <at> debbugs.gnu.org
Cc: Rodion Goritskov <rodion.goritskov@HIDDEN>
From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Date: Sat, 22 Jun 2024 23:33:55 +0400
Message-ID: <60dbc3caee3fc6038fceeeb5ca677cf1d626c8a7.1719082137.git.rodion.goritskov@HIDDEN>
In-Reply-To: <cover.1719082137.git.rodion.goritskov@HIDDEN>
References: <cover.1719082137.git.rodion.goritskov@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

* doc/guix.texi: Document (agate-service-type) updated options.

Change-Id: Ifb4968d704627344913bb69f20636d710a4fe738
---
 doc/guix.texi | 51 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 0102fd0fad..c75de94486 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -32734,25 +32734,30 @@ Web Services
 (service agate-service-type
 	 (agate-configuration
 	   (content "/srv/gemini")
-	   (cert "/srv/cert.pem")
-	   (key "/srv/key.rsa")))
+	   (certs "/srv/gemini-certs")))
 @end lisp
 
 The example above represents the minimal tweaking necessary to get Agate
-up and running.  Specifying the path to the certificate and key is
+up and running.  Specifying the path to the certificate and key directory is
 always necessary, as the Gemini protocol requires TLS by default.
 
-To obtain a certificate and a key, you could, for example, use OpenSSL,
-running a command similar to the following example:
+If specified path is writable by Agate, and contains no valid key
+and certificate, the Agate will try to generate them on the first start.
+If specified directory is read-only - key and certificate should be pre-generated by user.
+
+To obtain a certificate and a key in a DER format, you could, for example,
+use OpenSSL, running a commands similar to the following example:
 
 @example
-openssl req -x509 -newkey rsa:4096 -keyout key.rsa -out cert.pem \
-    -days 3650 -nodes -subj "/CN=example.com"
+openssl genpkey -out key.der -outform DER -algorithm RSA \
+    -pkeyopt rsa_keygen_bits:4096
+openssl req -x509 -key key.der -outform DER -days 3650 -out cert.der \
+    -subj "/CN=example.com"
 @end example
 
 Of course, you'll have to replace @i{example.com} with your own domain
 name, and then point the Agate configuration towards the path of the
-generated key and certificate.
+directory with the generated key and certificate using the @code{certs} option.
 
 @end defvar
 
@@ -32766,30 +32771,38 @@ Web Services
 @item @code{content} (default: @file{"/srv/gemini"})
 The directory from which Agate will serve files.
 
-@item @code{cert} (default: @code{#f})
-The path to the TLS certificate PEM file to be used for encrypted
-connections.  Must be filled in with a value from the user.
-
-@item @code{key} (default: @code{#f})
-The path to the PKCS8 private key file to be used for encrypted
-connections.  Must be filled in with a value from the user.
+@item @code{certs} (default: @file{"/srv/gemini-certs"})
+Root of the certificate directory. Must be filled in with a value from the user.
 
 @item @code{addr} (default: @code{'("0.0.0.0:1965" "[::]:1965")})
 A list of the addresses to listen on.
 
-@item @code{hostname} (default: @code{#f})
-The domain name of this Gemini server.  Optional.
+@item @code{hostnames} (default: @code{'()})
+Virtual hosts for the Gemini server. If multiple values are
+specified, corresponding directory names should be present in the @code{content}
+directory. Optional.
 
 @item @code{lang} (default: @code{#f})
 RFC 4646 language code(s) for text/gemini documents.  Optional.
 
-@item @code{silent?} (default: @code{#f})
-Set to @code{#t} to disable logging output.
+@item @code{only-tls13?} (default: @code{#f})
+Set to @code{#t} to disable support for TLSv1.2.
 
 @item @code{serve-secret?} (default: @code{#f})
 Set to @code{#t} to serve secret files (files/directories starting with
 a dot).
 
+@item @code{central-conf?} (default: @code{#f})
+Set to @code{#t} to look for the .meta configuration file in the @code{content}
+root directory and will ignore @code{.meta} files in other directories
+
+@item @code{ed25519?} (default: @code{#f})
+Set to @code{#t} to generate keys using the Ed25519 signature algorithm
+instead of the default ECDSA.
+
+@item @code{skip-port-check?} (default: @code{#f})
+Set to @code{#t} to skip URL port check even when a @code{hostname} is specified.
+
 @item @code{log-ip?} (default: @code{#t})
 Whether or not to output IP addresses when logging.
 
-- 
2.45.1

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#71722] [PATCH 2/2] services: agate-service-type: Update documentation.
Resent-From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 22 Jun 2024 19:38:01 +0000
Resent-Message-ID: <handler.71722.B71722.17190850645551 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71722
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 71722 <at> debbugs.gnu.org
Cc: Rodion Goritskov <rodion.goritskov@HIDDEN>
Received: via spool by 71722-submit <at> debbugs.gnu.org id=B71722.17190850645551
          (code B ref 71722); Sat, 22 Jun 2024 19:38:01 +0000
Received: (at 71722) by debbugs.gnu.org; 22 Jun 2024 19:37:44 +0000
Received: from localhost ([127.0.0.1]:57821 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sL6YS-0001RS-8a
	for submit <at> debbugs.gnu.org; Sat, 22 Jun 2024 15:37:44 -0400
Received: from mail-ed1-f41.google.com ([209.85.208.41]:61766)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <rodion.goritskov@HIDDEN>) id 1sL6YP-0001RD-NV
 for 71722 <at> debbugs.gnu.org; Sat, 22 Jun 2024 15:37:42 -0400
Received: by mail-ed1-f41.google.com with SMTP id
 4fb4d7f45d1cf-57d1012e52fso3515824a12.3
 for <71722 <at> debbugs.gnu.org>; Sat, 22 Jun 2024 12:37:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1719084995; x=1719689795; darn=debbugs.gnu.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=N1aXpfejDC0OoBW0DuXaBkhE9Tl2WF+PbORDgm0v8lI=;
 b=WPKBQ+dDEEb/A6D68SjyZy6VRtW87oZlUA8CdOBfxXDSbQCEWCliw4TvEM9casau9w
 +lJS8lAlMP/044fIGbEDjVGL4BFC4zjGDgCYUmZ5DD4BQNc6KMRmoC4ByTjItrcHCtx+
 7Gh4rcPSBaqN48EtMVqeQ2SJTrM4xyu4UqEKrx2Vh0LBxK6UpL+HkyRO5wANAuUUSfIa
 tTI0n1v7kb7yk7ehhnmF0Vhlxx+fEzqFDb7MyCyA+SNeI4ULwrQOlPEq+tYlZXeTSb4c
 l3ij1gnSH3fgY7KYWZPuadmDrwr/Txi/8koZF2rSwNBldrCSyGzaDtqLIEhqqUESKjxj
 Iu9Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1719084995; x=1719689795;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=N1aXpfejDC0OoBW0DuXaBkhE9Tl2WF+PbORDgm0v8lI=;
 b=Rdgyc+HuceWcdkRtqwxjjIhFwz3wA6/W7tBR0inpPJEUWSE/BDclqUXaUrOVJSY6Tu
 Pb691cJ1P4a/wiHPytEneZgSxsJO8IfL7I/TjQiOFQ0/ZP1A5i9WuzT5mA9MX0EmwxM0
 I6P/v9LQUi6T92QpN42A6zYKv/k6u3jPZAVhWYuahgNUBnUP/bq6vVdbDY41GyIh9/ls
 tZouPwFjoPVVOMUGk5qWwhTuYMqp4n23BspatRvM/fkRBd8qqzym2FIwlOnEczzibE4x
 /horFGAXwtMZxYCKAN73Hg8zew/1NYyj7ClSJVAHgr7saPLp+OnGOqg6tzqFq1TTmLzZ
 ieYw==
X-Gm-Message-State: AOJu0YyjYNQtFQrr1ee8t1DPXYrQ/tMjR0r+t0BtNdG9AoWxyVPYl7Hz
 TGBNJAmOw8ESqicqDaRpbvdD6vk3ab9LqIGVhzUuyg16aTjeWupokmvekw==
X-Google-Smtp-Source: AGHT+IEd05W2V78xhC4stBg3Ai+cQqzrI2PBHcbCFRkmSSHNjOkvX9wT5U/zodG8lfQahfMQnKT7fg==
X-Received: by 2002:a5d:4a47:0:b0:35f:22e4:fb58 with SMTP id
 ffacd0b85a97d-366e9463f42mr319110f8f.8.1719084930568; 
 Sat, 22 Jun 2024 12:35:30 -0700 (PDT)
Received: from bumblebee-mighty.lan ([92.51.75.166])
 by smtp.gmail.com with ESMTPSA id
 ffacd0b85a97d-366389b8ab0sm5433576f8f.27.2024.06.22.12.35.29
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 22 Jun 2024 12:35:30 -0700 (PDT)
From: Rodion Goritskov <rodion.goritskov@HIDDEN>
Date: Sat, 22 Jun 2024 23:33:55 +0400
Message-ID: <60dbc3caee3fc6038fceeeb5ca677cf1d626c8a7.1719082137.git.rodion.goritskov@HIDDEN>
X-Mailer: git-send-email 2.45.1
In-Reply-To: <cover.1719082137.git.rodion.goritskov@HIDDEN>
References: <cover.1719082137.git.rodion.goritskov@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* doc/guix.texi: Document (agate-service-type) updated options.

Change-Id: Ifb4968d704627344913bb69f20636d710a4fe738
---
 doc/guix.texi | 51 ++++++++++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 0102fd0fad..c75de94486 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -32734,25 +32734,30 @@ Web Services
 (service agate-service-type
 	 (agate-configuration
 	   (content "/srv/gemini")
-	   (cert "/srv/cert.pem")
-	   (key "/srv/key.rsa")))
+	   (certs "/srv/gemini-certs")))
 @end lisp
 
 The example above represents the minimal tweaking necessary to get Agate
-up and running.  Specifying the path to the certificate and key is
+up and running.  Specifying the path to the certificate and key directory is
 always necessary, as the Gemini protocol requires TLS by default.
 
-To obtain a certificate and a key, you could, for example, use OpenSSL,
-running a command similar to the following example:
+If specified path is writable by Agate, and contains no valid key
+and certificate, the Agate will try to generate them on the first start.
+If specified directory is read-only - key and certificate should be pre-generated by user.
+
+To obtain a certificate and a key in a DER format, you could, for example,
+use OpenSSL, running a commands similar to the following example:
 
 @example
-openssl req -x509 -newkey rsa:4096 -keyout key.rsa -out cert.pem \
-    -days 3650 -nodes -subj "/CN=example.com"
+openssl genpkey -out key.der -outform DER -algorithm RSA \
+    -pkeyopt rsa_keygen_bits:4096
+openssl req -x509 -key key.der -outform DER -days 3650 -out cert.der \
+    -subj "/CN=example.com"
 @end example
 
 Of course, you'll have to replace @i{example.com} with your own domain
 name, and then point the Agate configuration towards the path of the
-generated key and certificate.
+directory with the generated key and certificate using the @code{certs} option.
 
 @end defvar
 
@@ -32766,30 +32771,38 @@ Web Services
 @item @code{content} (default: @file{"/srv/gemini"})
 The directory from which Agate will serve files.
 
-@item @code{cert} (default: @code{#f})
-The path to the TLS certificate PEM file to be used for encrypted
-connections.  Must be filled in with a value from the user.
-
-@item @code{key} (default: @code{#f})
-The path to the PKCS8 private key file to be used for encrypted
-connections.  Must be filled in with a value from the user.
+@item @code{certs} (default: @file{"/srv/gemini-certs"})
+Root of the certificate directory. Must be filled in with a value from the user.
 
 @item @code{addr} (default: @code{'("0.0.0.0:1965" "[::]:1965")})
 A list of the addresses to listen on.
 
-@item @code{hostname} (default: @code{#f})
-The domain name of this Gemini server.  Optional.
+@item @code{hostnames} (default: @code{'()})
+Virtual hosts for the Gemini server. If multiple values are
+specified, corresponding directory names should be present in the @code{content}
+directory. Optional.
 
 @item @code{lang} (default: @code{#f})
 RFC 4646 language code(s) for text/gemini documents.  Optional.
 
-@item @code{silent?} (default: @code{#f})
-Set to @code{#t} to disable logging output.
+@item @code{only-tls13?} (default: @code{#f})
+Set to @code{#t} to disable support for TLSv1.2.
 
 @item @code{serve-secret?} (default: @code{#f})
 Set to @code{#t} to serve secret files (files/directories starting with
 a dot).
 
+@item @code{central-conf?} (default: @code{#f})
+Set to @code{#t} to look for the .meta configuration file in the @code{content}
+root directory and will ignore @code{.meta} files in other directories
+
+@item @code{ed25519?} (default: @code{#f})
+Set to @code{#t} to generate keys using the Ed25519 signature algorithm
+instead of the default ECDSA.
+
+@item @code{skip-port-check?} (default: @code{#f})
+Set to @code{#t} to skip URL port check even when a @code{hostname} is specified.
+
 @item @code{log-ip?} (default: @code{#t})
 Whether or not to output IP addresses when logging.
 
-- 
2.45.1

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#71722] [PATCH 0/2] services: Update agate-service-type to match actual agate options
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 26 Jul 2024 17:02:02 +0000
Resent-Message-ID: <handler.71722.B71722.172201328822606 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 71722
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Rodion Goritskov <rodion.goritskov@HIDDEN>
Cc: 71722 <at> debbugs.gnu.org
Received: via spool by 71722-submit <at> debbugs.gnu.org id=B71722.172201328822606
          (code B ref 71722); Fri, 26 Jul 2024 17:02:02 +0000
Received: (at 71722) by debbugs.gnu.org; 26 Jul 2024 17:01:28 +0000
Received: from localhost ([127.0.0.1]:39964 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sXOJr-0005sY-W7
	for submit <at> debbugs.gnu.org; Fri, 26 Jul 2024 13:01:28 -0400
Received: from eggs.gnu.org ([209.51.188.92]:44040)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@HIDDEN>) id 1sXOJp-0005sL-LA
 for 71722 <at> debbugs.gnu.org; Fri, 26 Jul 2024 13:01:26 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
 id 1sXOJa-0006KC-Vl; Fri, 26 Jul 2024 13:01:10 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
 From; bh=h/mC1TDCRlI2NhITmw4e3GlYRyT4umq/DXcq6NcM6Sc=; b=rm5EXf5J9TEorIbs9aai
 n3jrOk4H/iRQveH9CYNOYlg4TO1AnMb3F1tZN+3mKJhQG6B5mCvH7x51HBXfG0QThwbg+N9XuFvQN
 +j+nGky9hiwhEAqucDqIU5S/8NPtPRfgKMfMPwpUwWOo4WRkgBzrutmULNWsQF3GqGLvN1pbdfcBa
 aSEZRf7bXUQ96sgd0jzB3cGboxWh9HgZUDPo+WcsrOBwxIzJ6FpbBV0rt06RpyLqWaZhrI1lVAvUk
 iktu6yvWraJioHMvBFbtm+SGxzF2O7LWtfnhTV3aPUSgl49r786a+11LMIxTFQfTVraIMR/cd2rGw
 2t+NUsI3yUSfdw==;
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
In-Reply-To: <cover.1719082137.git.rodion.goritskov@HIDDEN> (Rodion
 Goritskov's message of "Sat, 22 Jun 2024 23:03:48 +0400")
References: <cover.1719082137.git.rodion.goritskov@HIDDEN>
Date: Fri, 26 Jul 2024 19:01:01 +0200
Message-ID: <87plr0ay0i.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hi Rodion,

Rodion Goritskov <rodion.goritskov@HIDDEN> skribis:

> This patches makes agate-service-type work again - because current versio=
n of agate present
> in Guix has some options (and their logic) changed, making service-type n=
ot working.
>
> I have checked this changes on VM and they seems to be working fine.
>
> Rodion Goritskov (2):
>   services: agate: Update options for compatibility with the current
>     Agate version.
>   services: agate-service-type: Update documentation.

I squashed the two patches (so that the doc is always consistent with
the code) and applied them.

A few things come to mind:

  1. Could you come up with a system test under gnu/tests/*.scm?  That
     would allow us to detect breakage early on next time.

  2. Though a deprecation policy has yet to be written, the idea is that
     we should avoid breaking changes in user configuration as happens
     when changing/removing fields in the config record.

  3. The convention in Guix is to avoid abbreviations (=E2=80=9Ccertificate=
s=E2=80=9D
     rather than =E2=80=9Ccerts=E2=80=9D, etc.).  I realize those were alre=
ady there
     though, so I thought I=E2=80=99d rather not ask you for extra work.

Thanks,
Ludo=E2=80=99.

Message received at control <at> debbugs.gnu.org:

Received: (at control) by debbugs.gnu.org; 26 Jul 2024 17:03:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 26 13:03:49 2024
Received: from localhost ([127.0.0.1]:39975 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sXOM9-0005wC-Km
	for submit <at> debbugs.gnu.org; Fri, 26 Jul 2024 13:03:49 -0400
Received: from eggs.gnu.org ([209.51.188.92]:33550)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@HIDDEN>) id 1sXOM7-0005vx-H8
 for control <at> debbugs.gnu.org; Fri, 26 Jul 2024 13:03:48 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1sXOLt-0006X4-2w
 for control <at> debbugs.gnu.org; Fri, 26 Jul 2024 13:03:33 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-version:Subject:From:To:Date:in-reply-to:
 references; bh=7YbsuoobogHxcCNgvqqEedT0i6+u9ajXIGR48Bzuz5A=; b=kosUAGEY/ntV6U
 FcpRHVR+IlhJycmh7qonDUZzZydCbIxx/qzRkfhXSWpENrrMHA9IXn5mMygBvpkJZHy7RiDckZtvo
 kiBoUX3BreAsot31dYuC3JyT2Y/glKG9+bzFdYvZ/gFxw9r2hRy48ndfiKKr0RGneUJ8RDsLgNNYm
 IaRnUjMiGQe/zpSgbJpOK3Tfa7mgHreFCwdIgRb4g5dBUxtZ0OJsoFcSRvcxL39uKkHbdFINnHODp
 WqTUbpOBW5AUI5PI0Lt/H/MMPH/gjSg7esc31uFQAFJ4KDDRBeJF0o2bKUIArSFBvh3ml7xBNSJGK
 85Izgo/ePQNbieya7IhA==;
Date: Fri, 26 Jul 2024 19:03:24 +0200
Message-Id: <87o76kaxwj.fsf@HIDDEN>
To: control <at> debbugs.gnu.org
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
Subject: control message for bug #71722
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: control
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

close 71722 
quit

Last modified: Fri, 26 Jul 2024 17:15:01 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.