From unknown Fri Aug 15 20:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72577] [PATCH 0/1] services: agate: Change variable names and add system test. Resent-From: Rodion Goritskov Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 11 Aug 2024 14:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72577@debbugs.gnu.org Cc: Rodion Goritskov , Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer Received: via spool by submit@debbugs.gnu.org id=B.172338681226151 (code B ref -1); Sun, 11 Aug 2024 14:34:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Aug 2024 14:33:32 +0000 Received: from localhost ([127.0.0.1]:41827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd9dU-0006nj-3U for submit@debbugs.gnu.org; Sun, 11 Aug 2024 10:33:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:38476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd9dS-0006na-9n for submit@debbugs.gnu.org; Sun, 11 Aug 2024 10:33:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sd9cx-0007Fa-7X for guix-patches@gnu.org; Sun, 11 Aug 2024 10:32:59 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sd9cv-0000xX-Gr for guix-patches@gnu.org; Sun, 11 Aug 2024 10:32:58 -0400 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-5b3fff87e6bso3956548a12.0 for ; Sun, 11 Aug 2024 07:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723386775; x=1723991575; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ouO71yfQIjVL6LOQYyqURMOC5SYJvrX+ussxdWS4uls=; b=Fdteluca992LoCrkob//krgisB2D8p6tRdNdnS/EqYsPYjRqz0BdAVI8N/pt+TZqTJ x7S1lAU/w557kFCCM0BHV0hPfQWqQNnpaA8x93sK7cDrYOR0Bx9mcQK8dpz9uxQV5usO z3Bo7rfoRVzKA5mJNDzjfU/Vl3n9vW5S+Brbyx7zL66T/bC50wloB9k8j6ocNlLGdlvm VwOJPFuLXIJB4fxKHVgYdeJwo0axy8GP/dmTFGZRQbG5EFJTaAl4p2Et7CXiUZuZKX0V NaENLKmWsNr3koDomEi8rVzhMLFT1HxGqrFq/5w+VUM1bUfDArcVtstNQepev2Ky/YvJ 5vpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723386775; x=1723991575; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ouO71yfQIjVL6LOQYyqURMOC5SYJvrX+ussxdWS4uls=; b=iQRQFRqOqeEnI0JK1UbH/W8QJAlHuCqjyTgoEgUaFQG2XLNHLN8qeSsXQXg2TxukMs FpruUvXpd83yUMGafLACC3tC15xkPh9ZkgaggrEjSuT/vB+OEIh2ytPMAafXL4fbZYI8 v11ZJuvB6lH7TgsoEUYefnwIz2dsMNjoGP9ehD+cIUPUqgVdGcg+6ZC5UeoQpgJUl6R8 bxTY73/3Rpz5gQmww0UILRKTVqHVcsNkZhpIlEXBkNbzYrIqKXTQYoKW1Y4Nkq+ovtL+ GY0Wwt9M4GuLMGQq/cwPjWxA7iso0/rKfJPvS5eTjeYczCFSrNdaovBEADJYoVSgY3pY Ar1A== X-Gm-Message-State: AOJu0Yx8fG6ahDEBZMGkFQGuyQ4McmbNzF2dLxlzOVRsZGQSoJZwU02Z ed6OpvaPvyDQ22FxbfQ/FCHQ55K/+Bw2WzZoZrUGTeHv5twC1W9FM7gUZefG X-Google-Smtp-Source: AGHT+IEYZ0fmJsvCCT92EFuNxwycvssj/I2NP3qKfyq3XcdYhBNU3Jdjnvl2qPVhI1equyicwkvY9Q== X-Received: by 2002:a17:907:3f21:b0:a7d:c9fa:e3b3 with SMTP id a640c23a62f3a-a80aa654b90mr518855766b.54.1723386774607; Sun, 11 Aug 2024 07:32:54 -0700 (PDT) Received: from bumblebee-mighty.lan ([92.51.75.166]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80bb1d24f4sm152359866b.140.2024.08.11.07.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 07:32:54 -0700 (PDT) From: Rodion Goritskov Date: Sun, 11 Aug 2024 18:32:22 +0400 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=rodion.goritskov@gmail.com; helo=mail-ed1-x532.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This is a follow up to the patchset in [1], which updated the configuration record to make agate service work again. However, the original ticket had some improvement suggestions, so this patch addresses them. Short option names are renamed to a long ones, documentation is updated and system test added. Compatibility of the service breaks again, so it is not OK now, please notify me on deprecation policy, I will update the patchset accordingly. 1: https://issues.guix.gnu.org/71722 Rodion Goritskov (1): services: agate: Change variable names and add system test. doc/guix.texi | 8 ++-- gnu/services/web.scm | 38 ++++++++-------- gnu/tests/web.scm | 105 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 127 insertions(+), 24 deletions(-) base-commit: 174ecf5b1077d29498d9de22e27b13047f314feb -- 2.45.2 From unknown Fri Aug 15 20:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72577] [PATCH 1/1] services: agate: Change variable names and add system test. Resent-From: Rodion Goritskov Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 11 Aug 2024 14:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72577@debbugs.gnu.org Cc: Rodion Goritskov , Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer Received: via spool by 72577-submit@debbugs.gnu.org id=B72577.172338738827053 (code B ref 72577); Sun, 11 Aug 2024 14:44:02 +0000 Received: (at 72577) by debbugs.gnu.org; 11 Aug 2024 14:43:08 +0000 Received: from localhost ([127.0.0.1]:41837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd9mm-00072G-8g for submit@debbugs.gnu.org; Sun, 11 Aug 2024 10:43:08 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:44448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd9mj-00071l-It for 72577@debbugs.gnu.org; Sun, 11 Aug 2024 10:43:06 -0400 Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-428ec6c190eso26706655e9.1 for <72577@debbugs.gnu.org>; Sun, 11 Aug 2024 07:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723387289; x=1723992089; 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=iZxZr+dMQWBjdmAgwrobnq+2tpzLPsVE7rCJLenlj4I=; b=RcYW5XsmRYb2oN31ikDYZpWIWUxFztZaWaofkGgT/FusTefaVQivd1KHo7Qk6dWxsy FogSPHFhmo82Lomqsb7Pp3PSnB9ai//0q8BCV+CAcThnpC9F90e1ZZX+A6glX5c/U0bG TsVG/YebYQEPuKpF3MTso3OYP2SjKIT4CamBfoou5QPe8U1SOYiijDQGailSBQFldrxn 7dL2Unr3HM/lkuFS7BBAwX4T5P9bJXtVp02kH/N8zwicGUTnLCe1JyY6OIBvW+djn+NE bqocQLa7JAlc3yowDTW8Og2hWydkzgMO8SkWYvyARBK6oxLRf6p4jDIbWk/Xb6/UDs4r MQPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723387289; x=1723992089; 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=iZxZr+dMQWBjdmAgwrobnq+2tpzLPsVE7rCJLenlj4I=; b=CW4rCLx8rxW94wIgoEbJpyVweoG5i56hwo5SvQgGpf5Hhd2mVNK+/wHduql9GFdphv ZIeM17VW2D32Mw/Vs0YSu0h+Mjrb7H+Kh4bzenmR1Od0+Jy/eLGzXnThxxUifR1/mO9B 4F/+qBTHA5YPobW/Z4yp4dz5FoFzDpqIKmdHBMKofQ2GEHaPrdSEFPtY/mMEGOIFQ3+C LTBy9mbbFl1xzAUTiXuoLsGtcr2DN59IWrVFmgb0LnQl2dpKYh41tAZ75jkNVuXcAtFP S3d/etowmygt5NxFg8qAzkUz1qeuF5QOTnDOsqzQU41/9mVyi/+Q7xG/jxkYMX5W67Kj 2Tvg== X-Gm-Message-State: AOJu0YxackUGr7l7Q1zv+GGz/8sfxxdm5vFMkJ9VhlgnoO3QVmR9TYsA JGb4jgkm90wvFYRZpSA9EUSE/c5QJGDEg1XhcUKLjH3HkD/XyPzihjuNPkvd X-Google-Smtp-Source: AGHT+IE/AHr0UsCOpuJxV/n7hc12QFaQtkOCyT/jqlNfdWF4ajCYcZ3pBWKhApSfJL993NNsNitqjA== X-Received: by 2002:a05:600c:45d0:b0:426:5cee:4abc with SMTP id 5b1f17b1804b1-429c3a29abcmr53241995e9.20.1723387287996; Sun, 11 Aug 2024 07:41:27 -0700 (PDT) Received: from bumblebee-mighty.lan ([92.51.75.166]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429c750e510sm68538775e9.13.2024.08.11.07.41.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 07:41:27 -0700 (PDT) From: Rodion Goritskov Date: Sun, 11 Aug 2024 18:40:59 +0400 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * doc/guix.texi (Web Services): Update documentation for agate-service-type. * gnu/services/web.scm (agate-configuration): Rename certs, addr, lang and central-conf variables. * gnu/tests/web.scm (%test-agate): Add system test for agate-service-type. Change-Id: Ie14814fca1d5158acd67899da0c3fc2c5b586c72 --- doc/guix.texi | 8 ++-- gnu/services/web.scm | 38 ++++++++-------- gnu/tests/web.scm | 105 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 127 insertions(+), 24 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6e03d8bbcc..271219c4db 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -32992,10 +32992,10 @@ Web Services @item @code{content} (default: @file{"/srv/gemini"}) The directory from which Agate will serve files. -@item @code{certs} (default: @file{"/srv/gemini-certs"}) +@item @code{certificates} (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")}) +@item @code{addresses} (default: @code{'("[::]:1965" "0.0.0.0:1965")}) A list of the addresses to listen on. @item @code{hostnames} (default: @code{'()}) @@ -33003,7 +33003,7 @@ Web Services specified, corresponding directory names should be present in the @code{content} directory. Optional. -@item @code{lang} (default: @code{#f}) +@item @code{languages} (default: @code{#f}) RFC 4646 language code(s) for text/gemini documents. Optional. @item @code{only-tls13?} (default: @code{#f}) @@ -33013,7 +33013,7 @@ Web Services Set to @code{#t} to serve secret files (files/directories starting with a dot). -@item @code{central-conf?} (default: @code{#f}) +@item @code{central-configuration?} (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 diff --git a/gnu/services/web.scm b/gnu/services/web.scm index e8ddb1d987..7adb416c39 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -2186,20 +2186,20 @@ (define-record-type* (default agate)) (content agate-configuration-content (default "/srv/gemini")) - (certs agate-configuration-certs - (default "/srv/gemini-certs")) - (addr agate-configuration-addr - (default '("0.0.0.0:1965" "[::]:1965"))) - (hostname agate-configuration-hostname - (default '())) - (lang agate-configuration-lang - (default #f)) + (certificates agate-configuration-certificatess + (default "/srv/gemini-certs")) + (addresses agate-configuration-addresses + (default '("[::]:1965" "0.0.0.0:1965"))) + (hostnames agate-configuration-hostnames + (default '())) + (languages agate-configuration-languages + (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)) + (central-configuration? agate-configuration-central-configuration + (default #f)) (ed25519? agate-configuration-ed25519 (default #f)) (skip-port-check? agate-configuration-skip-port-check @@ -2215,9 +2215,9 @@ (define-record-type* (define agate-shepherd-service (match-lambda - (($ package content certs addr - hostname lang only-tls13? - serve-secret? central-conf? + (($ package content certificates addresses + hostnames languages only-tls13? + serve-secret? central-configuration? ed25519? skip-port-check? log-ip? user group log-file) (list (shepherd-service @@ -2228,19 +2228,19 @@ (define agate-shepherd-service #~(make-forkexec-constructor (list #$agate "--content" #$content - "--certs" #$certs + "--certs" #$certificates #$@(append-map (lambda x (append '("--addr") x)) - addr) + addresses) #$@(append-map (lambda x (append '("--hostname") x)) - hostname) - #$@(if lang - (list "--lang" lang) + hostnames) + #$@(if languages + (list "--lang" languages) '()) #$@(if serve-secret? '("--serve-secret") '()) #$@(if only-tls13? '("--only-tls13") '()) - #$@(if central-conf? '("--central-conf") '()) + #$@(if central-configuration? '("--central-conf") '()) #$@(if ed25519? '("--ed25519") '()) #$@(if skip-port-check? '("--skip-port-check") '()) #$@(if log-ip? '("--log-ip") '())) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 16dc6bea49..a071e05e1d 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -34,8 +34,10 @@ (define-module (gnu tests web) #:use-module (gnu services shepherd) #:use-module (gnu services mail) #:use-module (gnu packages databases) + #:use-module (gnu packages guile-xyz) #:use-module (gnu packages patchutils) #:use-module (gnu packages python) + #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (guix packages) #:use-module (guix modules) @@ -50,7 +52,8 @@ (define-module (gnu tests web) %test-php-fpm %test-hpcguix-web %test-tailon - %test-patchwork)) + %test-patchwork + %test-agate)) (define %index.html-contents ;; Contents of the /index.html file. @@ -657,3 +660,103 @@ (define %test-patchwork (name "patchwork") (description "Connect to a running Patchwork service.") (value (run-patchwork-test patchwork)))) + + +;;; +;;; Agate +;;; + +(define %index.gmi-contents + ;; Contents of the /index.gmi file. + "Hello, guix!") + +(define %make-agate-root + ;; Create our server root in /srv. + #~(begin + (mkdir "/srv") + (mkdir "/srv/gemini") + (mkdir "/srv/gemini-certs") + ;; Directory should be writable for Agate user to generate certificates + (let ((user (getpw "agate"))) + (chown "/srv/gemini-certs" (passwd:uid user) (passwd:gid user))) + (call-with-output-file (string-append "/srv/gemini/index.gmi") + (lambda (port) + (display #$%index.gmi-contents port))))) + +(define %agate-os + (simple-operating-system + (service dhcp-client-service-type) + (simple-service 'make-agate-root activation-service-type + %make-agate-root) + (service agate-service-type + (agate-configuration + (hostnames '("localhost")))))) + +(define* (run-agate-test name test-os expected-content) + (define os + (marionette-operating-system + test-os + #:imported-modules '((gnu services herd) + (guix combinators)) + #:extensions (list guile-gemini guile-gnutls))) + + (define forwarded-port 1965) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings `((1965 . ,forwarded-port))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-64) + (gnu build marionette)) + + (define marionette + (make-marionette (list #$vm))) + + (test-runner-current (system-test-runner #$output)) + (test-begin #$name) + + (test-assert #$(string-append name " service running") + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (match (start-service '#$(string->symbol name)) + (#f #f) + (('service response-parts ...) + (match (assq-ref response-parts 'running) + ((#t) #t) + ((pid) (number? pid)))))) + marionette)) + + (test-assert "Agate TCP port ready, IPv4" + (wait-for-tcp-port #$forwarded-port marionette)) + + (test-assert "Agate TCP port ready, IPv6" + (wait-for-tcp-port #$forwarded-port marionette + #:address + '(make-socket-address + AF_INET6 (inet-pton AF_INET6 "::1") #$forwarded-port))) + + (test-equal "Agate responses with the specified index.gmi" + #$expected-content + (marionette-eval '(begin + (use-modules (ice-9 iconv) + (gemini client) + (gemini request) + (gemini response)) + (bytevector->string (gemini-response-body-bytes + (send-gemini-request + (build-gemini-request #:host "localhost" #:port #$forwarded-port))) + "utf8")) marionette)) + + (test-end)))) + (gexp->derivation "agate-test" test)) + +(define %test-agate + (system-test + (name "agate") + (description "Connect to a running Agate service.") + (value (run-agate-test name %agate-os %index.gmi-contents)))) -- 2.45.2 From unknown Fri Aug 15 20:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72577] [PATCH v2] services: agate: Change variable names and add system test. References: In-Reply-To: Resent-From: Rodion Goritskov Original-Sender: "Debbugs-submit" Resent-CC: rodion.goritskov@gmail.com, pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 12 Aug 2024 05:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72577@debbugs.gnu.org Cc: Rodion Goritskov , Rodion Goritskov , Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer X-Debbugs-Original-Xcc: Rodion Goritskov , Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer Received: via spool by 72577-submit@debbugs.gnu.org id=B72577.172344081322655 (code B ref 72577); Mon, 12 Aug 2024 05:34:02 +0000 Received: (at 72577) by debbugs.gnu.org; 12 Aug 2024 05:33:33 +0000 Received: from localhost ([127.0.0.1]:42267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sdNgS-0005tJ-8p for submit@debbugs.gnu.org; Mon, 12 Aug 2024 01:33:32 -0400 Received: from mail-lf1-f46.google.com ([209.85.167.46]:47588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sdNgP-0005sx-Mb for 72577@debbugs.gnu.org; Mon, 12 Aug 2024 01:33:30 -0400 Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-52f04150796so5042553e87.3 for <72577@debbugs.gnu.org>; Sun, 11 Aug 2024 22:32:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723440712; x=1724045512; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fkB63BWYbrvzEw5pn28h0Wx2wJHCk6ii2LyT7EXNxQA=; b=Vo9zjQXKhVeJpu6dIT9SUzK6lAYpeR7alyN6Yix6HKo0RqR2Fqb4rSk67MP6OOWS6j FBWKwyL44Qc46tzl/6PKEDIjf0B6MVNspPbd9QsWXkp+/Q/heiKno6KF/KlHtQg1Cs29 Pb5VJx+UFQQDXYuzD+TvOAz8UcdXm/7tusUN5loezI9VfwMP7tzR565qa+M5yiAX8FEU UtpBJVPs/MzSOG9NUFxmIzBtvu1VkfJm0IBeCl3WOtkrAbYFzOhQFxOslySRbh07dPH3 /ErPiAXibh0gmEc6zJ7LOaRxnHAKMOaqDgBrHX7OSu8ROKyYrn0iwpf6izbPLY+j2F8a 1h8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723440712; x=1724045512; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fkB63BWYbrvzEw5pn28h0Wx2wJHCk6ii2LyT7EXNxQA=; b=RnK20N/IWd1N8D1AyKAXf9cxa4NUSvwPXpEeYKJ1+f+FRr7pT3Jxgjf283PK8IQDAP artzHqUgZsHj8sdQ0MGzyioEwioxehayhqBeiQT7vZTnw00gtuxt/A8eNZEE/B96wZBi dkkiuEcr1UwYJJNfXEJxX8rJ2E8E1Tv8vFBRu/G2ffnE82Tht4CWTuDw3J+vLXgXhRAY 9PJ8J98UsYMFWFQVAeW/BIcpBjrxHQvSwqafKhToDpIYkm5+e1N3wnV38nTpAOz1WBku OcHozKe7ODsUHrladKdlP7Y9E32WeII54famHeGusGr43yKJ2gAT4faHwEjJD7A7rVN2 hTlw== X-Gm-Message-State: AOJu0YzzfTl7nD6HrWVT98WHTmnK2NM/jghZzaMPpW+nlaIgNqxf8F3Y Ga9Ekf+Kbob1IffVooVOYUHSKZ3ui6Tt4Sdp5cGO6unS/FbP7PmY2ivdWk+a X-Google-Smtp-Source: AGHT+IFUxaNmfXpKqhOM9pEExZyZ2ag91XywfZiAjb1si+qviTGU9VLi2lFLp0C7UB6edjyh6or09Q== X-Received: by 2002:a05:6512:3ca9:b0:52e:6d71:e8f1 with SMTP id 2adb3069b0e04-530eea0f9ebmr5794720e87.53.1723440710765; Sun, 11 Aug 2024 22:31:50 -0700 (PDT) Received: from bumblebee-old.lan ([92.51.75.166]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80bb09014csm197991666b.25.2024.08.11.22.31.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 22:31:50 -0700 (PDT) From: Rodion Goritskov Date: Mon, 12 Aug 2024 09:31:14 +0400 Message-ID: <2b6a6bd5b88bc70fb686930040d1764e195b08dd.1723440525.git.rodion.goritskov@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * doc/guix.texi (Web Services): Update documentation for agate-service-type. * gnu/services/web.scm (agate-configuration): Rename certs, addr, lang and central-conf variables. * gnu/tests/web.scm (%test-agate): Add system test for agate-service-type. Change-Id: Ie14814fca1d5158acd67899da0c3fc2c5b586c72 --- doc/guix.texi | 10 ++--- gnu/services/web.scm | 38 ++++++++-------- gnu/tests/web.scm | 105 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 128 insertions(+), 25 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6e03d8bbcc..8acba533c2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -32955,7 +32955,7 @@ Web Services (service agate-service-type (agate-configuration (content "/srv/gemini") - (certs "/srv/gemini-certs"))) + (certificates "/srv/gemini-certs"))) @end lisp The example above represents the minimal tweaking necessary to get Agate @@ -32992,10 +32992,10 @@ Web Services @item @code{content} (default: @file{"/srv/gemini"}) The directory from which Agate will serve files. -@item @code{certs} (default: @file{"/srv/gemini-certs"}) +@item @code{certificates} (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")}) +@item @code{addresses} (default: @code{'("[::]:1965" "0.0.0.0:1965")}) A list of the addresses to listen on. @item @code{hostnames} (default: @code{'()}) @@ -33003,7 +33003,7 @@ Web Services specified, corresponding directory names should be present in the @code{content} directory. Optional. -@item @code{lang} (default: @code{#f}) +@item @code{languages} (default: @code{#f}) RFC 4646 language code(s) for text/gemini documents. Optional. @item @code{only-tls13?} (default: @code{#f}) @@ -33013,7 +33013,7 @@ Web Services Set to @code{#t} to serve secret files (files/directories starting with a dot). -@item @code{central-conf?} (default: @code{#f}) +@item @code{central-configuration?} (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 diff --git a/gnu/services/web.scm b/gnu/services/web.scm index e8ddb1d987..cc6f4e6d9b 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -2186,20 +2186,20 @@ (define-record-type* (default agate)) (content agate-configuration-content (default "/srv/gemini")) - (certs agate-configuration-certs - (default "/srv/gemini-certs")) - (addr agate-configuration-addr - (default '("0.0.0.0:1965" "[::]:1965"))) - (hostname agate-configuration-hostname - (default '())) - (lang agate-configuration-lang - (default #f)) + (certificates agate-configuration-certificates + (default "/srv/gemini-certs")) + (addresses agate-configuration-addresses + (default '("[::]:1965" "0.0.0.0:1965"))) + (hostnames agate-configuration-hostnames + (default '())) + (languages agate-configuration-languages + (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)) + (central-configuration? agate-configuration-central-configuration + (default #f)) (ed25519? agate-configuration-ed25519 (default #f)) (skip-port-check? agate-configuration-skip-port-check @@ -2215,9 +2215,9 @@ (define-record-type* (define agate-shepherd-service (match-lambda - (($ package content certs addr - hostname lang only-tls13? - serve-secret? central-conf? + (($ package content certificates addresses + hostnames languages only-tls13? + serve-secret? central-configuration? ed25519? skip-port-check? log-ip? user group log-file) (list (shepherd-service @@ -2228,19 +2228,19 @@ (define agate-shepherd-service #~(make-forkexec-constructor (list #$agate "--content" #$content - "--certs" #$certs + "--certs" #$certificates #$@(append-map (lambda x (append '("--addr") x)) - addr) + addresses) #$@(append-map (lambda x (append '("--hostname") x)) - hostname) - #$@(if lang - (list "--lang" lang) + hostnames) + #$@(if languages + (list "--lang" languages) '()) #$@(if serve-secret? '("--serve-secret") '()) #$@(if only-tls13? '("--only-tls13") '()) - #$@(if central-conf? '("--central-conf") '()) + #$@(if central-configuration? '("--central-conf") '()) #$@(if ed25519? '("--ed25519") '()) #$@(if skip-port-check? '("--skip-port-check") '()) #$@(if log-ip? '("--log-ip") '())) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 16dc6bea49..a071e05e1d 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -34,8 +34,10 @@ (define-module (gnu tests web) #:use-module (gnu services shepherd) #:use-module (gnu services mail) #:use-module (gnu packages databases) + #:use-module (gnu packages guile-xyz) #:use-module (gnu packages patchutils) #:use-module (gnu packages python) + #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (guix packages) #:use-module (guix modules) @@ -50,7 +52,8 @@ (define-module (gnu tests web) %test-php-fpm %test-hpcguix-web %test-tailon - %test-patchwork)) + %test-patchwork + %test-agate)) (define %index.html-contents ;; Contents of the /index.html file. @@ -657,3 +660,103 @@ (define %test-patchwork (name "patchwork") (description "Connect to a running Patchwork service.") (value (run-patchwork-test patchwork)))) + + +;;; +;;; Agate +;;; + +(define %index.gmi-contents + ;; Contents of the /index.gmi file. + "Hello, guix!") + +(define %make-agate-root + ;; Create our server root in /srv. + #~(begin + (mkdir "/srv") + (mkdir "/srv/gemini") + (mkdir "/srv/gemini-certs") + ;; Directory should be writable for Agate user to generate certificates + (let ((user (getpw "agate"))) + (chown "/srv/gemini-certs" (passwd:uid user) (passwd:gid user))) + (call-with-output-file (string-append "/srv/gemini/index.gmi") + (lambda (port) + (display #$%index.gmi-contents port))))) + +(define %agate-os + (simple-operating-system + (service dhcp-client-service-type) + (simple-service 'make-agate-root activation-service-type + %make-agate-root) + (service agate-service-type + (agate-configuration + (hostnames '("localhost")))))) + +(define* (run-agate-test name test-os expected-content) + (define os + (marionette-operating-system + test-os + #:imported-modules '((gnu services herd) + (guix combinators)) + #:extensions (list guile-gemini guile-gnutls))) + + (define forwarded-port 1965) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings `((1965 . ,forwarded-port))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-64) + (gnu build marionette)) + + (define marionette + (make-marionette (list #$vm))) + + (test-runner-current (system-test-runner #$output)) + (test-begin #$name) + + (test-assert #$(string-append name " service running") + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (match (start-service '#$(string->symbol name)) + (#f #f) + (('service response-parts ...) + (match (assq-ref response-parts 'running) + ((#t) #t) + ((pid) (number? pid)))))) + marionette)) + + (test-assert "Agate TCP port ready, IPv4" + (wait-for-tcp-port #$forwarded-port marionette)) + + (test-assert "Agate TCP port ready, IPv6" + (wait-for-tcp-port #$forwarded-port marionette + #:address + '(make-socket-address + AF_INET6 (inet-pton AF_INET6 "::1") #$forwarded-port))) + + (test-equal "Agate responses with the specified index.gmi" + #$expected-content + (marionette-eval '(begin + (use-modules (ice-9 iconv) + (gemini client) + (gemini request) + (gemini response)) + (bytevector->string (gemini-response-body-bytes + (send-gemini-request + (build-gemini-request #:host "localhost" #:port #$forwarded-port))) + "utf8")) marionette)) + + (test-end)))) + (gexp->derivation "agate-test" test)) + +(define %test-agate + (system-test + (name "agate") + (description "Connect to a running Agate service.") + (value (run-agate-test name %agate-os %index.gmi-contents)))) base-commit: 174ecf5b1077d29498d9de22e27b13047f314feb -- 2.45.2 From unknown Fri Aug 15 20:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72577] [PATCH v2] services: agate: Change variable names and add system test. References: Resent-From: Christopher Howard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Aug 2024 17:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Rodion Goritskov Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer , 72577@debbugs.gnu.org, Matthew Trzcinski , Florian Pelz Received: via spool by 72577-submit@debbugs.gnu.org id=B72577.17238308049168 (code B ref 72577); Fri, 16 Aug 2024 17:54:02 +0000 Received: (at 72577) by debbugs.gnu.org; 16 Aug 2024 17:53:24 +0000 Received: from localhost ([127.0.0.1]:52811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf18e-0002No-4P for submit@debbugs.gnu.org; Fri, 16 Aug 2024 13:53:24 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:48260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf18b-0002NX-Ss for 72577@debbugs.gnu.org; Fri, 16 Aug 2024 13:53:22 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id E6A50317EFAB; Fri, 16 Aug 2024 19:52:37 +0200 (CEST) Authentication-Results: ext-mx-out011.mykolab.com (amavis); dkim=pass (2048-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :message-id:date:date:in-reply-to:subject:subject:from:from :received:received:received; s=dkim20240523; t=1723830757; x= 1725645158; bh=vnzkPZ+fKuTcOknIsdaLbMYSyGytZ3zGmAf8/OvPc6U=; b=n OVbTxHgIcqgDdz73TU7Nk2I/Z4HuZkJ/xROrrz/GZ+G25/sywA3e8Y9VeRxknmpK pd7CUdL/b1Kt21e4pwRYxlZtYS+uT0hr015qFhXIYs6EnaQnjPzQn2Rm+wWyAfGV +jb3yoexLPzapgP/R6K6BHrxnvvGgfLfM1C7bJWw7M9xTyu/qBCuYzlz+HQMjyBZ 4B914wc49zcWWP8rGmopRURZRmHo84ADQXMsrpWyL/iS4ufuBuDHTq563VpqYh5c IpEymGiUpc1nQ3CMP4cm1P+Aod5H1iXkOSaEzdyZV6jh7Y24/RGhnvDQxwhmDdZ1 6FdC58oafLJdeidwl6MHg== X-Virus-Scanned: amavis at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1 X-Spam-Level: X-Spam-Status: No, score=-1 tagged_above=-10 required=5 tests=[ALL_TRUSTED=-1] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out011.mykolab.com [127.0.0.1]) (amavis, port 10024) with ESMTP id guQJKMfVloq9; Fri, 16 Aug 2024 19:52:37 +0200 (CEST) Received: from int-mx009.mykolab.com (unknown [10.9.13.9]) by mx.kolabnow.com (Postfix) with ESMTPS id 94B79317EFA9; Fri, 16 Aug 2024 19:52:34 +0200 (CEST) Received: from ext-subm010.mykolab.com (unknown [10.9.6.10]) by int-mx009.mykolab.com (Postfix) with ESMTPS id 98BC220C896B; Fri, 16 Aug 2024 19:52:33 +0200 (CEST) From: Christopher Howard In-Reply-To: Rodion Goritskov's message of "Mon, 12 Aug 2024 09:31:14 +0400 (4 days, 12 hours, 14 minutes ago)" Date: Fri, 16 Aug 2024 09:52:29 -0800 Message-ID: <877ccgtkwy.fsf@librehacker.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, I'm testing these patches in a qemu VM. I thought I should share that, = if I explicitly set the certs field, I get an error: ``` /home/user/config.scm:52:35: error: (agate-configuration (content "/srv/gem= ini") (certs "/srv/gemini-tls") (log-ip? #f)): extraneous field initializer= s (certs) ``` Here is the config file: ``` ;; -*- mode: scheme; -*- ;; This is an operating system configuration template ;; for a "bare bones" setup, with no X11 display server. (use-modules (gnu)) (use-service-modules networking ssh web) (use-package-modules screen ssh) (operating-system (host-name "guix") (timezone "America/Anchorage") (locale "en_US.utf8") ;; Boot in "legacy" BIOS mode, assuming /dev/sdX is the ;; target hard disk, and "my-root" is the label of the target ;; root file system. (bootloader (bootloader-configuration (bootloader grub-bootloader) (targets '("/dev/sda")))) ;; It's fitting to support the equally bare bones =E2=80=98-nographic=E2= =80=99 ;; QEMU option, which also nicely sidesteps forcing QWERTY. (kernel-arguments (list "console=3DttyS0,115200")) (file-systems (cons (file-system (device (file-system-label "my-root")) (mount-point "/") (type "ext4")) %base-file-systems)) ;; This is where user accounts are specified. The "root" ;; account is implicit, and is initially created with the ;; empty password. (users (cons (user-account (name "user") (comment "Generic user") (group "users") ;; Adding the account to the "wheel" group ;; makes it a sudoer. Adding it to "audio" ;; and "video" allows the user to play sound ;; and access the webcam. (supplementary-groups '("wheel" "audio" "video"))) %base-user-accounts)) ;; Globally-installed packages. (packages (cons screen %base-packages)) ;; Add services to the baseline: a DHCP client and an SSH ;; server. You may wish to add an NTP service here. (services (append (list (service dhcp-client-service-type) (service agate-service-type (agate-configuration (content "/srv/gemini") (certs "/srv/gemini-tls") (log-ip? #f))) (service openssh-service-type (openssh-configuration (openssh openssh-sans-x) (port-number 2222)))) %base-services))) ``` --=20 Christopher Howard From unknown Fri Aug 15 20:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72577] [PATCH v2] services: agate: Change variable names and add system test. Resent-From: Rodion Goritskov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Aug 2024 19:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Howard Cc: Rodion Goritskov , Maxim Cournoyer , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Florian Pelz , 72577@debbugs.gnu.org, Matthew Trzcinski Received: via spool by 72577-submit@debbugs.gnu.org id=B72577.172383525016577 (code B ref 72577); Fri, 16 Aug 2024 19:08:02 +0000 Received: (at 72577) by debbugs.gnu.org; 16 Aug 2024 19:07:30 +0000 Received: from localhost ([127.0.0.1]:52921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf2IM-0004JJ-HG for submit@debbugs.gnu.org; Fri, 16 Aug 2024 15:07:30 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:51597) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf2IK-0004J5-Mj for 72577@debbugs.gnu.org; Fri, 16 Aug 2024 15:07:29 -0400 Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-428178fc07eso16037935e9.3 for <72577@debbugs.gnu.org>; Fri, 16 Aug 2024 12:06:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723835145; x=1724439945; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=849loYygyryrjO958kGghfUx0Fy1MnxZdOMUkwv3PpY=; b=HGIvuuguxG/EhbB9x5tUcGxKGdHanXRRSkBO4iqWRZqXa0h9921LqlD7liahoGbWe1 j6j/XddE9BN7r86cCS2YWQoNwBgdGT8JMof5Eej5wk06sxHEt1tpa2qOb4VINgQpc3bh vMp/rsr4LmIrrybZ0B42ZUe/so85fyk+V3g2ChPOSoBz4rFheEM5uWtWpK5UOHsGGR7l +1/4IzQ6/WCufWnSa+fe/wl8Qw+18wEWspUDBKIsh8s0vvhs69tP39KlnjUc2+qNnSVK ysn0yjvpSc2BiQIoWUE9diUWiFZWAOSvfvlP2FAPBcu/iZAnzOpje7Xkeb+5ZbWWWrMM yPVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723835145; x=1724439945; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=849loYygyryrjO958kGghfUx0Fy1MnxZdOMUkwv3PpY=; b=t/NeTWAAgaPy2eVDiRnTGcp95ftny56RSuT1Jh/jPq3cELSdVEyD48DH/pNL2yPW/y Cu7KiPVCdMeC+uCx7GBqQH9jeGYC7ZjsVXjiBqa1ZgxeVpDJoJUTs3sRSP+sRw1cjblm z8r4s6pA2R71H0h9dH6MbBtG5POxFQNMXeDcNUwq8B3G4enub2l5ikyZv8rnXO8XC0mq 0xrrrclnKHqFPlZ1ZeCgu+0UaTA6bgr7W/lvBRMX0pAZkveuRag7sdvyeN7rQV7CCkdt rQQLdY0AIzgj6JxcwK/vFkGYbVPf3ttCYKrdU8RrLGliUr+T/xVanejIlIWOjj+As/3h m/AQ== X-Forwarded-Encrypted: i=1; AJvYcCUbc9MPmYx/DIxlMycyOO4u/FJSIfu7NcNrAsCEp6jrmqd3jolbQxXyvjwauzaUPyEx6VJS8AiBodywmZlf7ZMGem9byWY= X-Gm-Message-State: AOJu0YzaxpwvNaXqt6LVtZKpsP5qEEYkJfTEu/gYn5fJE9I6MyyxVU9a 8veG3ZSay388UgH15gNHQ7baINEbgCcAiUIsMSgv5ISMzT36PrHg X-Google-Smtp-Source: AGHT+IE0/Ak3FZhP8EejWLVp1mVPWDYnWKXBOBk16e8fWgq1Wn/dx9oebV7NWzFq9EtFBweq0FMeoQ== X-Received: by 2002:a05:600c:3595:b0:426:5416:67d7 with SMTP id 5b1f17b1804b1-429ed7e41f0mr24051605e9.27.1723835144173; Fri, 16 Aug 2024 12:05:44 -0700 (PDT) Received: from bumblebee-mighty ([92.51.75.166]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37189849611sm4251666f8f.25.2024.08.16.12.05.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 12:05:43 -0700 (PDT) From: Rodion Goritskov In-Reply-To: <877ccgtkwy.fsf@librehacker.com> (Christopher Howard's message of "Fri, 16 Aug 2024 09:52:29 -0800") References: <877ccgtkwy.fsf@librehacker.com> Date: Fri, 16 Aug 2024 23:05:41 +0400 Message-ID: <87jzggcmpm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Christopher Howard writes: >Hi, I'm testing these patches in a qemu VM. I thought I should share that, if I explicitly set the certs field, I get an error: > > ``` > /home/user/config.scm:52:35: error: (agate-configuration (content "/srv/gemini") (certs "/srv/gemini-tls") (log-ip? #f)): extraneous field initializers (certs) > ``` > This patch (intentionally) renames the field "certs" to the "certificates", as was advised in [1]. I could maintain the compatibility here, but taking into account how long the Agate service was broken, I thought there are not a lot of users, so we could just rename the field. Good to know you are interested in the Agate service too! So, in your case you could change the configuration to something like that: (service agate-service-type (agate-configuration (content "/srv/gemini") (certificates "/srv/gemini-tls") (log-ip? #f))) 1: https://issues.guix.gnu.org/71722 From unknown Fri Aug 15 20:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72577] [PATCH v2] services: agate: Change variable names and add system test. References: Resent-From: Christopher Howard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Aug 2024 19:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Rodion Goritskov Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Florian Pelz , 72577@debbugs.gnu.org, Maxim Cournoyer , Matthew Trzcinski Received: via spool by 72577-submit@debbugs.gnu.org id=B72577.172383537816800 (code B ref 72577); Fri, 16 Aug 2024 19:10:02 +0000 Received: (at 72577) by debbugs.gnu.org; 16 Aug 2024 19:09:38 +0000 Received: from localhost ([127.0.0.1]:52933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf2KQ-0004Mu-DI for submit@debbugs.gnu.org; Fri, 16 Aug 2024 15:09:38 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:45984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf2KP-0004Mf-8H for 72577@debbugs.gnu.org; Fri, 16 Aug 2024 15:09:37 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id ADFB89C258; Fri, 16 Aug 2024 21:08:53 +0200 (CEST) Authentication-Results: ext-mx-out013.mykolab.com (amavis); dkim=pass (2048-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-type:content-type:mime-version:message-id:date:date :in-reply-to:subject:subject:from:from:received:received :received; s=dkim20240523; t=1723835333; x=1725649734; bh=h+1TFC ButGW3cC93A5IIl2eXiDOaTayR8nYTjdtF6/0=; b=Q2G9NmZPf2ze/vydBrBqI9 PyFJRUnHm//0hrqU+hoiYAWzDpEylQkwIcPVqjQQFVtqBQvGMU9spZl7Q/q24UkX tK1XTb+7/sLD0YDviOJbr0/0PxjLm5Xx5ZNN/4sY5Vf+j12BW5ATzJen5fo5dTgv iY1QRmTN11w2qJ1B2THfiwNWixEd5tDyi8Sc9zVbpBmjHaVklwbfm4L61hzJhUG0 F1789D6MYVpHVApNHdUWwImdSBfeWSm7kCtrw3mynTQ6cphQkn5qQr1CZvn1T7P5 u0AKea8LPPXmnjzATCg77IyU4M++1vUJURZ/oGKKtjMJfgbykmYihVh1RFbEnkpQ == X-Virus-Scanned: amavis at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1 X-Spam-Level: X-Spam-Status: No, score=-1 tagged_above=-10 required=5 tests=[ALL_TRUSTED=-1] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out013.mykolab.com [127.0.0.1]) (amavis, port 10024) with ESMTP id mgm95MF7lQ7Z; Fri, 16 Aug 2024 21:08:53 +0200 (CEST) Received: from int-mx011.mykolab.com (unknown [10.9.13.11]) by mx.kolabnow.com (Postfix) with ESMTPS id DD58398678; Fri, 16 Aug 2024 21:08:52 +0200 (CEST) Received: from ext-subm010.mykolab.com (unknown [10.9.6.10]) by int-mx011.mykolab.com (Postfix) with ESMTPS id 136D2316E7C4; Fri, 16 Aug 2024 21:08:52 +0200 (CEST) From: Christopher Howard In-Reply-To: Christopher Howard's message of "Fri, 16 Aug 2024 09:52:29 -0800 (1 hour, 11 minutes, 4 seconds ago)" Date: Fri, 16 Aug 2024 11:08:48 -0800 Message-ID: <8734n4thdr.fsf@librehacker.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Another little detail perhaps worth noting: the guix documentation specifies that if no valid key and certificate is available, then Agate will try to generate them on its own. However, if you attempt to go this route, you get an error: ``` 2024-08-16 10:58:21 No keys or certificates were found in the given directory. 2024-08-16 10:58:21 Specify the --hostname option to generate these automatically. ``` But there does not appear to be a hostname field available to agate-configuration, or at least it is not documented. Only the "hostnames" field for virtual hosts. -- Christopher Howard From unknown Fri Aug 15 20:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72577] [PATCH v2] services: agate: Change variable names and add system test. Resent-From: Rodion Goritskov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Aug 2024 19:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Howard Cc: Rodion Goritskov , Maxim Cournoyer , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Florian Pelz , 72577@debbugs.gnu.org, Matthew Trzcinski Received: via spool by 72577-submit@debbugs.gnu.org id=B72577.172383579817450 (code B ref 72577); Fri, 16 Aug 2024 19:17:02 +0000 Received: (at 72577) by debbugs.gnu.org; 16 Aug 2024 19:16:38 +0000 Received: from localhost ([127.0.0.1]:52937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf2RC-0004XO-9a for submit@debbugs.gnu.org; Fri, 16 Aug 2024 15:16:38 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:60853) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf2RA-0004XC-Ln for 72577@debbugs.gnu.org; Fri, 16 Aug 2024 15:16:37 -0400 Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4280ca0791bso17157305e9.1 for <72577@debbugs.gnu.org>; Fri, 16 Aug 2024 12:15:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723835693; x=1724440493; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=lgvDx+n/BodbP0UNX9fetIUPlzeL1KdDit2H7TwitFw=; b=KGJXEr+3BMeIrfLaZDGadSfJGuN+t1sFZ6PrcXVNY021wpiGpChPKkqAFWsSwjiwDS 2s1drDANVTtCse8g7WzwYh7K8U0FtAQwyC1V+pD5BuUk64VC4L5+za+xlgkHQnXzMWcw n8VmdsObe24TzFULZF/Kpl9681zZUqMVWkb/6de8HhlMsCfPK5CaE558QnYwBwKhlky/ +V8FaXGEYSs7MVMrTowLckn/Yn0IyAgbv+ZeIgqQ8aXL0rMPazh9V9Ri0bAoQnT3sZi4 hYmGpYmwmsnV9Bmzq0y7AiVxCYlzThQADMY7HAZrPQe+SpDJusK5Aq0xV5x7ojGi3Ene /fbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723835693; x=1724440493; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=lgvDx+n/BodbP0UNX9fetIUPlzeL1KdDit2H7TwitFw=; b=e5fevzY6jdu033zJJZBIdG5Vx8ptGL3IqRA6gzQgfD+Du8IOH5E6V9qe23ryc3WEhc 2awLs0j41pSgoTM0DJpsfDo3qYHVegFMe6z2+yvPDbpUIdUq6FJJ3RFpdWvUYyMkyPeA CMk+y0kBxBM4zzvnkjYmzNO02kKjp9U9ru5uhtnbcHGyQf5j8Hg3fzJPKy+IJtakBVY6 zCD17S5EwnxBT0WQ9LGT+9vtKrVPVmxQL0A0uSCnfa/T+z3/VzEoGP+NJcZlB9qn8ye8 XvlL34x4s8AAq0xuhZFz6PoI3PNSLyaJBHBUWHJveYLi0Dio6/sjAhcxiVnxhxxp4XG4 rs1w== X-Forwarded-Encrypted: i=1; AJvYcCVtADJZ4jZFP3ewUDm0gBoMzd/rZmwXAyGCNPrg2J+2mitychsGNSQT/xifM/yKyBwy5o+cd2DbrzKZw8QsKmx8AAbv1xc= X-Gm-Message-State: AOJu0YxlJopLZIJGHlIuD0IIp26I+TTcJTAjbwaLwqxbu11mXgpEQkSu m5BhUR4pHjqUDWxCEms5/lDr2MQsKKNEV0OMmbd8UlanvFIFAw9l X-Google-Smtp-Source: AGHT+IEdcs20dFBznwkMJZYyqEpe/j6YZe2hTH6gKIrX98HSoEorc8L2IbMI120aPscORDc8rRSczQ== X-Received: by 2002:a05:600c:450b:b0:428:640:c1b1 with SMTP id 5b1f17b1804b1-429ed7c0944mr24171865e9.17.1723835692280; Fri, 16 Aug 2024 12:14:52 -0700 (PDT) Received: from bumblebee-mighty ([92.51.75.166]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429dec83d2asm83784905e9.0.2024.08.16.12.14.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 12:14:51 -0700 (PDT) From: Rodion Goritskov In-Reply-To: <8734n4thdr.fsf@librehacker.com> (Christopher Howard's message of "Fri, 16 Aug 2024 11:08:48 -0800") References: <8734n4thdr.fsf@librehacker.com> Date: Fri, 16 Aug 2024 23:14:50 +0400 Message-ID: <87ed6ocmad.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Christopher Howard writes: > Another little detail perhaps worth noting: the guix documentation > specifies that if no valid key and certificate is available, then > Agate will try to generate them on its own. However, if you attempt to > go this route, you get an error: > > ``` > 2024-08-16 10:58:21 No keys or certificates were found in the given directory. > 2024-08-16 10:58:21 Specify the --hostname option to generate these automatically. > ``` > > But there does not appear to be a hostname field available to agate-configuration, or at least it is not documented. Only the "hostnames" field for virtual hosts. Actually, "hostnames" field in agate-configuration is a list of hostnames that are passed as --hostname options to Agate. I am going to update documentation pointing out that certificates are going to be generated only if any hostnames are present in the "hostnames" field. From unknown Fri Aug 15 20:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72577] [PATCH v3 0/1] services: agate: Change variable names and add system test. References: In-Reply-To: Resent-From: Rodion Goritskov Original-Sender: "Debbugs-submit" Resent-CC: rodion.goritskov@gmail.com, christopher@librehacker.com, pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 16 Aug 2024 21:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72577@debbugs.gnu.org Cc: Rodion Goritskov , Rodion Goritskov , Christopher Howard , Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer X-Debbugs-Original-Xcc: Rodion Goritskov , Christopher Howard , Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer Received: via spool by 72577-submit@debbugs.gnu.org id=B72577.172384284128899 (code B ref 72577); Fri, 16 Aug 2024 21:15:01 +0000 Received: (at 72577) by debbugs.gnu.org; 16 Aug 2024 21:14:01 +0000 Received: from localhost ([127.0.0.1]:53006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf4Gn-0007W0-6m for submit@debbugs.gnu.org; Fri, 16 Aug 2024 17:14:01 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:52635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf4Gl-0007Vb-Gv for 72577@debbugs.gnu.org; Fri, 16 Aug 2024 17:14:00 -0400 Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-42803bbf842so24368145e9.1 for <72577@debbugs.gnu.org>; Fri, 16 Aug 2024 14:13:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723842735; x=1724447535; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=swT6IhaU5H0bOVaY/XVfZAO3LTvKiUErCUauABAen2Y=; b=aVcl8i/EoBVsZU3W7RBYCfigarmVZwj12AC+lvxMtndUcmP9s9FS773pWvoo97hsd0 YDv0IrzWQHAF8hsEjYIhdRbTZduFFLh4X6ouaGjBLZHcmbbNS/eC5yYFHJvj7PDc/UBb eHw2tyjBojo+qnLgIWqJOULs+aZEqB5vO6oDwzFtYufRxdd/2ZJi9W4xIYdk5V+zp8tP DzOXVINGX8oZL13ugTU7xPAVuFcKc+tJQCAiFEEaE2KuoBuYttrjCFHXaaok21uxJxIx xVQJQQ9a3WodW4VcxtL5NpbZFhxh/HoxGVePv3yPTI0vuEVoRe37ZiVpagsexmNZzoqj mQXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723842735; x=1724447535; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=swT6IhaU5H0bOVaY/XVfZAO3LTvKiUErCUauABAen2Y=; b=F6h6nw6jRdTdi+Er30xPeyyQgxN7Zw5p/SrZ+kP/SEm+0RnYb3FAkGSshnf9gXQIm/ Jg9LFTAb1u64t1NVHdbWetQzpKSof9d1a+Jn8d0t83nvV7M+2SQg0Mnm4Uk1B/RgNEoS tjKywKIn9J1XTb0DOJ3B+vmrHqKpcuXsPG/sggGvPWQDKE3GXhwUhohx79b+hErBSls7 BscuH8F3Dr19a4r5URwh4bCuKdDKQP+2BGDFlb6178neKWy/WVdHxlmaRWTOoxvGV2M6 Ket4LdQ6202oAHJ8M8uWJ9YordSJYZvuS7wDEhhLq8NLFE8KZUmSO4fXs8HQ7M34iOPD xFTg== X-Gm-Message-State: AOJu0Yw8slcrpOMCW1hd+vqeRwczka6Tx91xfwNms9bBLN8Z06Hw/wu5 iO0Vz6VTosbTCq9n5QPp/dbIVRwIJpVrpGQvMGg5/XyrcT+WfyKRvWBoCN5NO5A= X-Google-Smtp-Source: AGHT+IFsHQmwcOwByP99eCVFb2tiBAU7676mBJeM5NGOIBYsjgFfLkigKVnmZ1lcXZNL6btx9BR7rg== X-Received: by 2002:adf:e443:0:b0:371:8b49:f49c with SMTP id ffacd0b85a97d-3719431576amr2936953f8f.5.1723842734609; Fri, 16 Aug 2024 14:12:14 -0700 (PDT) Received: from bumblebee-mighty.lan ([92.51.75.166]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718985a6d1sm4443481f8f.57.2024.08.16.14.12.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 14:12:14 -0700 (PDT) From: Rodion Goritskov Date: Sat, 17 Aug 2024 01:11:49 +0400 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Updated version of the patch with tuned documentation. Rodion Goritskov (1): services: agate: Change variable names and add system test. doc/guix.texi | 21 +++++---- gnu/services/web.scm | 38 ++++++++-------- gnu/tests/web.scm | 105 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 135 insertions(+), 29 deletions(-) base-commit: e64960bd7edfdbd0ea99c68705526bcc778effb5 -- 2.45.2 From unknown Fri Aug 15 20:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72577] [PATCH v3 1/1] services: agate: Change variable names and add system test. Resent-From: Rodion Goritskov Original-Sender: "Debbugs-submit" Resent-CC: rodion.goritskov@gmail.com, christopher@librehacker.com, pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 16 Aug 2024 21:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72577@debbugs.gnu.org Cc: Rodion Goritskov , Rodion Goritskov , Christopher Howard , Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer X-Debbugs-Original-Xcc: Rodion Goritskov , Christopher Howard , Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer Received: via spool by 72577-submit@debbugs.gnu.org id=B72577.172384285828946 (code B ref 72577); Fri, 16 Aug 2024 21:15:02 +0000 Received: (at 72577) by debbugs.gnu.org; 16 Aug 2024 21:14:18 +0000 Received: from localhost ([127.0.0.1]:53009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf4H3-0007Wk-Gp for submit@debbugs.gnu.org; Fri, 16 Aug 2024 17:14:18 -0400 Received: from mail-wr1-f48.google.com ([209.85.221.48]:60635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sf4H1-0007WW-4e for 72577@debbugs.gnu.org; Fri, 16 Aug 2024 17:14:15 -0400 Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-367990aaef3so1357735f8f.0 for <72577@debbugs.gnu.org>; Fri, 16 Aug 2024 14:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723842751; x=1724447551; 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=h1R0wSkN0HkuqNUnm2QO5ynS8823QHqxHgLYE+OuYb0=; b=mvvQb+/vwpXPacAW27+bYCmDN4cS55S7K3oikIRowiqKUIfA72jUzQUTfYWTsE8gKK RJ3YND1Yo688cVGemTvIAFDJtSBWrLa/Z6SSx845SKT54wX5v+tE5wkx0yZ1yikcfpZW 7Pa42dqAMI3MBt34T7DPmfVBYlIqkx2ZhDxXVflYn/0uiCz3Ne/5DH2yZY5/Y71mxRjb zglh+bWrfU9Yur0q9yeiBrawyzOlqJa89Rt9XWjIfdmx2h+UN/Zs/R53k+eKuNLj/MYe 91V2JBimHuSqR9KcHBIpsFQrN9MRAJNlsARDFwfPOEuPujaaTX+4ZDVX+bFovmlkz9gr s/2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723842751; x=1724447551; 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=h1R0wSkN0HkuqNUnm2QO5ynS8823QHqxHgLYE+OuYb0=; b=wMLiwHyxbW3rVDOMZjCuMfKv/TOyr0GliUMY7D101NKhKQof+WHCUN6+S9Ko5AFju9 s+F3EfWoCWmvbttRx5ISjqV24UWLjzOt40/GatdtRsfZgzRMEYoO4ee85/K5KNx3ZFu8 14CjbnIHI40/bUOhz8upD//WdLPAxMEjUN3N3EiA5RtpmygFEnr9JoTzs8wajuwRsQBd wTtWSMPt2NEgjisS3YiVY/Zp7xw+3JSZ4OWsvAimWUwHQdtb96QL2bxz3Rm29JpIUHt+ zChQKsB7kD8TTUnPZwGLNhRDpAq5+hUnK8m2V+igvChCUAnbkdgPYFSJPlCTzBCkruN8 fD/A== X-Gm-Message-State: AOJu0Yzb28xr3e4j3KDJjVTWMbXneRqLDG3bv+95erWiZUN+yfaMkLF4 Z9AfJLAKSy0WXNwJAr19ZkFsA5JK/gO0Yjo5NG7L3QCElX2+I3JunnBJybTxOoE= X-Google-Smtp-Source: AGHT+IE/UP7ypDWTW9TGo4e0XOh8kgxKL8d5tbr3pRGWm6FS1L9Vmh+EXDNhyFguI/AEhfOo3/D4jA== X-Received: by 2002:adf:9b9a:0:b0:368:6598:131e with SMTP id ffacd0b85a97d-3719468f012mr2659180f8f.38.1723842750168; Fri, 16 Aug 2024 14:12:30 -0700 (PDT) Received: from bumblebee-mighty.lan ([92.51.75.166]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718985a6d1sm4443481f8f.57.2024.08.16.14.12.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 14:12:29 -0700 (PDT) From: Rodion Goritskov Date: Sat, 17 Aug 2024 01:11:50 +0400 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * doc/guix.texi (Web Services): Update documentation for agate-service-type. * gnu/services/web.scm (agate-configuration): Rename certs, addr, lang and central-conf variables. * gnu/tests/web.scm (%test-agate): Add system test for agate-service-type. Change-Id: Ie14814fca1d5158acd67899da0c3fc2c5b586c72 --- doc/guix.texi | 21 +++++---- gnu/services/web.scm | 38 ++++++++-------- gnu/tests/web.scm | 105 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 135 insertions(+), 29 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 27e6f6adf3..539418e94b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -32956,16 +32956,19 @@ Web Services (service agate-service-type (agate-configuration (content "/srv/gemini") - (certs "/srv/gemini-certs"))) + (certificates "/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 directory is always necessary, as the Gemini protocol requires TLS by default. -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. +If specified @code{certificates} path is writable by Agate, and contains no +valid pre-generated key and certificate, the Agate will try to generate +them on the first start. In this case you should pass at least one +hostname using the @code{hostnames} option. +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: @@ -32979,7 +32982,7 @@ Web Services 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 -directory with the generated key and certificate using the @code{certs} option. +directory with the generated key and certificate using the @code{certificates} option. @end defvar @@ -32993,10 +32996,10 @@ Web Services @item @code{content} (default: @file{"/srv/gemini"}) The directory from which Agate will serve files. -@item @code{certs} (default: @file{"/srv/gemini-certs"}) +@item @code{certificates} (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")}) +@item @code{addresses} (default: @code{'("[::]:1965" "0.0.0.0:1965")}) A list of the addresses to listen on. @item @code{hostnames} (default: @code{'()}) @@ -33004,7 +33007,7 @@ Web Services specified, corresponding directory names should be present in the @code{content} directory. Optional. -@item @code{lang} (default: @code{#f}) +@item @code{languages} (default: @code{#f}) RFC 4646 language code(s) for text/gemini documents. Optional. @item @code{only-tls13?} (default: @code{#f}) @@ -33014,7 +33017,7 @@ Web Services Set to @code{#t} to serve secret files (files/directories starting with a dot). -@item @code{central-conf?} (default: @code{#f}) +@item @code{central-configuration?} (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 diff --git a/gnu/services/web.scm b/gnu/services/web.scm index e8ddb1d987..cc6f4e6d9b 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -2186,20 +2186,20 @@ (define-record-type* (default agate)) (content agate-configuration-content (default "/srv/gemini")) - (certs agate-configuration-certs - (default "/srv/gemini-certs")) - (addr agate-configuration-addr - (default '("0.0.0.0:1965" "[::]:1965"))) - (hostname agate-configuration-hostname - (default '())) - (lang agate-configuration-lang - (default #f)) + (certificates agate-configuration-certificates + (default "/srv/gemini-certs")) + (addresses agate-configuration-addresses + (default '("[::]:1965" "0.0.0.0:1965"))) + (hostnames agate-configuration-hostnames + (default '())) + (languages agate-configuration-languages + (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)) + (central-configuration? agate-configuration-central-configuration + (default #f)) (ed25519? agate-configuration-ed25519 (default #f)) (skip-port-check? agate-configuration-skip-port-check @@ -2215,9 +2215,9 @@ (define-record-type* (define agate-shepherd-service (match-lambda - (($ package content certs addr - hostname lang only-tls13? - serve-secret? central-conf? + (($ package content certificates addresses + hostnames languages only-tls13? + serve-secret? central-configuration? ed25519? skip-port-check? log-ip? user group log-file) (list (shepherd-service @@ -2228,19 +2228,19 @@ (define agate-shepherd-service #~(make-forkexec-constructor (list #$agate "--content" #$content - "--certs" #$certs + "--certs" #$certificates #$@(append-map (lambda x (append '("--addr") x)) - addr) + addresses) #$@(append-map (lambda x (append '("--hostname") x)) - hostname) - #$@(if lang - (list "--lang" lang) + hostnames) + #$@(if languages + (list "--lang" languages) '()) #$@(if serve-secret? '("--serve-secret") '()) #$@(if only-tls13? '("--only-tls13") '()) - #$@(if central-conf? '("--central-conf") '()) + #$@(if central-configuration? '("--central-conf") '()) #$@(if ed25519? '("--ed25519") '()) #$@(if skip-port-check? '("--skip-port-check") '()) #$@(if log-ip? '("--log-ip") '())) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 16dc6bea49..a071e05e1d 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -34,8 +34,10 @@ (define-module (gnu tests web) #:use-module (gnu services shepherd) #:use-module (gnu services mail) #:use-module (gnu packages databases) + #:use-module (gnu packages guile-xyz) #:use-module (gnu packages patchutils) #:use-module (gnu packages python) + #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (guix packages) #:use-module (guix modules) @@ -50,7 +52,8 @@ (define-module (gnu tests web) %test-php-fpm %test-hpcguix-web %test-tailon - %test-patchwork)) + %test-patchwork + %test-agate)) (define %index.html-contents ;; Contents of the /index.html file. @@ -657,3 +660,103 @@ (define %test-patchwork (name "patchwork") (description "Connect to a running Patchwork service.") (value (run-patchwork-test patchwork)))) + + +;;; +;;; Agate +;;; + +(define %index.gmi-contents + ;; Contents of the /index.gmi file. + "Hello, guix!") + +(define %make-agate-root + ;; Create our server root in /srv. + #~(begin + (mkdir "/srv") + (mkdir "/srv/gemini") + (mkdir "/srv/gemini-certs") + ;; Directory should be writable for Agate user to generate certificates + (let ((user (getpw "agate"))) + (chown "/srv/gemini-certs" (passwd:uid user) (passwd:gid user))) + (call-with-output-file (string-append "/srv/gemini/index.gmi") + (lambda (port) + (display #$%index.gmi-contents port))))) + +(define %agate-os + (simple-operating-system + (service dhcp-client-service-type) + (simple-service 'make-agate-root activation-service-type + %make-agate-root) + (service agate-service-type + (agate-configuration + (hostnames '("localhost")))))) + +(define* (run-agate-test name test-os expected-content) + (define os + (marionette-operating-system + test-os + #:imported-modules '((gnu services herd) + (guix combinators)) + #:extensions (list guile-gemini guile-gnutls))) + + (define forwarded-port 1965) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings `((1965 . ,forwarded-port))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-64) + (gnu build marionette)) + + (define marionette + (make-marionette (list #$vm))) + + (test-runner-current (system-test-runner #$output)) + (test-begin #$name) + + (test-assert #$(string-append name " service running") + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (match (start-service '#$(string->symbol name)) + (#f #f) + (('service response-parts ...) + (match (assq-ref response-parts 'running) + ((#t) #t) + ((pid) (number? pid)))))) + marionette)) + + (test-assert "Agate TCP port ready, IPv4" + (wait-for-tcp-port #$forwarded-port marionette)) + + (test-assert "Agate TCP port ready, IPv6" + (wait-for-tcp-port #$forwarded-port marionette + #:address + '(make-socket-address + AF_INET6 (inet-pton AF_INET6 "::1") #$forwarded-port))) + + (test-equal "Agate responses with the specified index.gmi" + #$expected-content + (marionette-eval '(begin + (use-modules (ice-9 iconv) + (gemini client) + (gemini request) + (gemini response)) + (bytevector->string (gemini-response-body-bytes + (send-gemini-request + (build-gemini-request #:host "localhost" #:port #$forwarded-port))) + "utf8")) marionette)) + + (test-end)))) + (gexp->derivation "agate-test" test)) + +(define %test-agate + (system-test + (name "agate") + (description "Connect to a running Agate service.") + (value (run-agate-test name %agate-os %index.gmi-contents)))) -- 2.45.2 From unknown Fri Aug 15 20:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72577] [PATCH v3 1/1] services: agate: Change variable names and add system test. References: Resent-From: Christopher Howard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Aug 2024 21:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Rodion Goritskov Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer , 72577@debbugs.gnu.org, Matthew Trzcinski , Florian Pelz Received: via spool by 72577-submit@debbugs.gnu.org id=B72577.172419018928607 (code B ref 72577); Tue, 20 Aug 2024 21:44:02 +0000 Received: (at 72577) by debbugs.gnu.org; 20 Aug 2024 21:43:09 +0000 Received: from localhost ([127.0.0.1]:33742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgWdB-0007RL-DX for submit@debbugs.gnu.org; Tue, 20 Aug 2024 17:43:09 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:52180) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgWd9-0007Qt-LE for 72577@debbugs.gnu.org; Tue, 20 Aug 2024 17:43:08 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 247A23123DE1; Tue, 20 Aug 2024 23:42:18 +0200 (CEST) Authentication-Results: ext-mx-out011.mykolab.com (amavis); dkim=pass (2048-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-type:content-type:mime-version:message-id:date:date :in-reply-to:subject:subject:from:from:received:received :received; s=dkim20240523; t=1724190137; x=1726004538; bh=RO+aGp RxuhDkz9KAUqWjtcdQRSF2pYf2d1RI+j7HzYM=; b=ReC8SUqV0bC7/K7JJK1Y40 SLj+VFV48qgu0ZOE7KbFFur6rM3ng0olQ0sQ5gphQmxTyQKL4wgo8nbdx/vNx/AG d1eRniDJn4p7PrA5WpjVClCQFt6rmk0KClpGw64qRRZn5hLbU3VSCguP5F4pXe+R N4hU56qrn4//5cnjOJx8MWgRmKnUyo0sxN1+HTagIh6ScLNlhHBDXUmgXBTDswPp Nr9qfl6AQz/RvTujZsKajQ7sc0I0mh03q7WzE2dVDnz4u7Iw2gVSSqk56Rap9/HS I5BKi10NasiE2P5PZMzw2HqG0w5ZXIFOxGydDRPq3STc78Btay2n2eZMtI80NRbg == X-Virus-Scanned: amavis at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1 X-Spam-Level: X-Spam-Status: No, score=-1 tagged_above=-10 required=5 tests=[ALL_TRUSTED=-1] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out011.mykolab.com [127.0.0.1]) (amavis, port 10024) with ESMTP id tyRaz2Zf-J-0; Tue, 20 Aug 2024 23:42:17 +0200 (CEST) Received: from int-mx009.mykolab.com (unknown [10.9.13.9]) by mx.kolabnow.com (Postfix) with ESMTPS id EFC593123DDF; Tue, 20 Aug 2024 23:42:16 +0200 (CEST) Received: from ext-subm010.mykolab.com (unknown [10.9.6.10]) by int-mx009.mykolab.com (Postfix) with ESMTPS id 1E25520913A3; Tue, 20 Aug 2024 23:42:16 +0200 (CEST) From: Christopher Howard In-Reply-To: Rodion Goritskov's message of "Sat, 17 Aug 2024 01:11:50 +0400 (4 days, 24 minutes, 46 seconds ago)" Date: Tue, 20 Aug 2024 13:42:12 -0800 Message-ID: <877ccaswgb.fsf@librehacker.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Tested v3 patch inside qemu VM. Works correctly so far. ``` user@guix ~$ gmni gemini://localhost # Hello World! ``` -- Christopher Howard From unknown Fri Aug 15 20:56:07 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#72577] [PATCH v3 1/1] services: agate: Change variable names and add system test. References: Resent-From: Christopher Howard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Aug 2024 23:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Rodion Goritskov Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer , 72577@debbugs.gnu.org, Matthew Trzcinski , Florian Pelz Received: via spool by 72577-submit@debbugs.gnu.org id=B72577.17241954825175 (code B ref 72577); Tue, 20 Aug 2024 23:12:02 +0000 Received: (at 72577) by debbugs.gnu.org; 20 Aug 2024 23:11:22 +0000 Received: from localhost ([127.0.0.1]:33845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgY0Y-0001LP-BR for submit@debbugs.gnu.org; Tue, 20 Aug 2024 19:11:22 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:54656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgY0V-0001L6-Ar for 72577@debbugs.gnu.org; Tue, 20 Aug 2024 19:11:21 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 9D568311290F; Wed, 21 Aug 2024 01:10:29 +0200 (CEST) Authentication-Results: ext-mx-out011.mykolab.com (amavis); dkim=pass (2048-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-type:content-type:mime-version:message-id:date:date :in-reply-to:subject:subject:from:from:received:received :received; s=dkim20240523; t=1724195429; x=1726009830; bh=7apyq0 hG15yig61XsxA4uoUYxLIFcvsg/TwM3ZNuP3Q=; b=KzRr74L9bjzcY/G/THJiON JFI+Tam7uzwFOK9pUqOSziFJ1sSFe3qb2qSAp0j7nw9TpYFfRCEIzdnvlfzDo6Kg LJsqsYB5f2HQ8dKtFTRBz8yjPxu5uSsMVomjyaPy63nG3D8kOlpde2cp5qiIdhh9 +UKN8QQtWes7MfQVStVIZnwp5a35GjZT+fOq4ueevMTRA1uDcFSiAR5uMl+LrpCj 9r4wNtOEz1n9S6xbbJuAwL0vygLeHdsURvCXP2LWHlnIzLs2ci+dQODtcIDxtBsN gThrLfw1H7JRGGvtuyMCI2UMyI/2YECXoZMLCZinFsKO9EuniahvIgr+BaVYm4Rw == X-Virus-Scanned: amavis at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1 X-Spam-Level: X-Spam-Status: No, score=-1 tagged_above=-10 required=5 tests=[ALL_TRUSTED=-1] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out011.mykolab.com [127.0.0.1]) (amavis, port 10024) with ESMTP id G3Z4silA5YsM; Wed, 21 Aug 2024 01:10:29 +0200 (CEST) Received: from int-mx009.mykolab.com (unknown [10.9.13.9]) by mx.kolabnow.com (Postfix) with ESMTPS id A8C0B311290E; Wed, 21 Aug 2024 01:10:27 +0200 (CEST) Received: from ext-subm010.mykolab.com (unknown [10.9.6.10]) by int-mx009.mykolab.com (Postfix) with ESMTPS id B22EA20C699A; Wed, 21 Aug 2024 01:10:27 +0200 (CEST) From: Christopher Howard In-Reply-To: Rodion Goritskov's message of "Sat, 17 Aug 2024 01:11:50 +0400 (4 days, 1 hour, 53 minutes ago)" Date: Tue, 20 Aug 2024 15:10:23 -0800 Message-ID: <8734myssdc.fsf@librehacker.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I was finally was able to upgrade my agate production server, using the v3 patch! Capsule pages are serving out fine. Thanks! It is great to be up-to-date again. -- Christopher Howard From unknown Fri Aug 15 20:56:07 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Rodion Goritskov Subject: bug#72577: closed (Re: [bug#72577] [PATCH v3 1/1] services: agate: Change variable names and add system test.) Message-ID: References: <87o758hbb4.fsf@gnu.org> X-Gnu-PR-Message: they-closed 72577 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 72577@debbugs.gnu.org Date: Sat, 31 Aug 2024 17:08:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1725124082-22448-1" This is a multi-part message in MIME format... ------------=_1725124082-22448-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #72577: [PATCH 0/1] services: agate: Change variable names and add system t= est. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 72577@debbugs.gnu.org. --=20 72577: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D72577 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1725124082-22448-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 72577-done) by debbugs.gnu.org; 31 Aug 2024 17:07:17 +0000 Received: from localhost ([127.0.0.1]:55970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skRZE-0005os-P5 for submit@debbugs.gnu.org; Sat, 31 Aug 2024 13:07:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skRZD-0005of-IV for 72577-done@debbugs.gnu.org; Sat, 31 Aug 2024 13:07:16 -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 ) id 1skRYB-0002z0-1P; Sat, 31 Aug 2024 13:06:11 -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=6DqwrALh+LB++CYHceJz/29avk07N5+KaOMJ7eKJCtc=; b=pkdov00XUIRXLlW0XtSU AHL6/wsdT37HOHuFKASjpz6FrFZpAHmdKZbOc8a98eyZfxpJm8K/pi9jytHTdy7ovN2RAEwRpPN7I HacZ/vabEReXFlY+1qaQDtHxmQWAbhCf9T/Slqo6E8A9BKAs9s9VP0GI2PiNupeSAN9+dS8+71i+a LDWiE6CFloMJ/VbzxaJPzXUUH1VFieHIG2ZPW1tUsei+d28rQv4QApErIBzLkhHvb3PHYpNBRNAlC hNZi2FR+Pf0fiFcL5Glghz13eae6qGr8mRNtkkU7pjpFlnpaWXsbUSUw7YhfuJ/Id4q48BbxnkgkH Rya1yoN1J0KkAg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Rodion Goritskov Subject: Re: [bug#72577] [PATCH v3 1/1] services: agate: Change variable names and add system test. In-Reply-To: (Rodion Goritskov's message of "Sat, 17 Aug 2024 01:11:50 +0400") References: Date: Sat, 31 Aug 2024 19:06:07 +0200 Message-ID: <87o758hbb4.fsf@gnu.org> 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-Debbugs-Envelope-To: 72577-done Cc: Christopher Howard , Maxim Cournoyer , Florian Pelz , Matthew Trzcinski , 72577-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Rodion, Rodion Goritskov skribis: > * doc/guix.texi (Web Services): Update documentation for agate-service-ty= pe. > * gnu/services/web.scm (agate-configuration): Rename certs, addr, lang and > central-conf variables. > * gnu/tests/web.scm (%test-agate): Add system test for agate-service-type. > > Change-Id: Ie14814fca1d5158acd67899da0c3fc2c5b586c72 Applied, thanks! Ludo=E2=80=99. ------------=_1725124082-22448-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 11 Aug 2024 14:33:32 +0000 Received: from localhost ([127.0.0.1]:41827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd9dU-0006nj-3U for submit@debbugs.gnu.org; Sun, 11 Aug 2024 10:33:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:38476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd9dS-0006na-9n for submit@debbugs.gnu.org; Sun, 11 Aug 2024 10:33:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sd9cx-0007Fa-7X for guix-patches@gnu.org; Sun, 11 Aug 2024 10:32:59 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sd9cv-0000xX-Gr for guix-patches@gnu.org; Sun, 11 Aug 2024 10:32:58 -0400 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-5b3fff87e6bso3956548a12.0 for ; Sun, 11 Aug 2024 07:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723386775; x=1723991575; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ouO71yfQIjVL6LOQYyqURMOC5SYJvrX+ussxdWS4uls=; b=Fdteluca992LoCrkob//krgisB2D8p6tRdNdnS/EqYsPYjRqz0BdAVI8N/pt+TZqTJ x7S1lAU/w557kFCCM0BHV0hPfQWqQNnpaA8x93sK7cDrYOR0Bx9mcQK8dpz9uxQV5usO z3Bo7rfoRVzKA5mJNDzjfU/Vl3n9vW5S+Brbyx7zL66T/bC50wloB9k8j6ocNlLGdlvm VwOJPFuLXIJB4fxKHVgYdeJwo0axy8GP/dmTFGZRQbG5EFJTaAl4p2Et7CXiUZuZKX0V NaENLKmWsNr3koDomEi8rVzhMLFT1HxGqrFq/5w+VUM1bUfDArcVtstNQepev2Ky/YvJ 5vpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723386775; x=1723991575; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ouO71yfQIjVL6LOQYyqURMOC5SYJvrX+ussxdWS4uls=; b=iQRQFRqOqeEnI0JK1UbH/W8QJAlHuCqjyTgoEgUaFQG2XLNHLN8qeSsXQXg2TxukMs FpruUvXpd83yUMGafLACC3tC15xkPh9ZkgaggrEjSuT/vB+OEIh2ytPMAafXL4fbZYI8 v11ZJuvB6lH7TgsoEUYefnwIz2dsMNjoGP9ehD+cIUPUqgVdGcg+6ZC5UeoQpgJUl6R8 bxTY73/3Rpz5gQmww0UILRKTVqHVcsNkZhpIlEXBkNbzYrIqKXTQYoKW1Y4Nkq+ovtL+ GY0Wwt9M4GuLMGQq/cwPjWxA7iso0/rKfJPvS5eTjeYczCFSrNdaovBEADJYoVSgY3pY Ar1A== X-Gm-Message-State: AOJu0Yx8fG6ahDEBZMGkFQGuyQ4McmbNzF2dLxlzOVRsZGQSoJZwU02Z ed6OpvaPvyDQ22FxbfQ/FCHQ55K/+Bw2WzZoZrUGTeHv5twC1W9FM7gUZefG X-Google-Smtp-Source: AGHT+IEYZ0fmJsvCCT92EFuNxwycvssj/I2NP3qKfyq3XcdYhBNU3Jdjnvl2qPVhI1equyicwkvY9Q== X-Received: by 2002:a17:907:3f21:b0:a7d:c9fa:e3b3 with SMTP id a640c23a62f3a-a80aa654b90mr518855766b.54.1723386774607; Sun, 11 Aug 2024 07:32:54 -0700 (PDT) Received: from bumblebee-mighty.lan ([92.51.75.166]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80bb1d24f4sm152359866b.140.2024.08.11.07.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 07:32:54 -0700 (PDT) From: Rodion Goritskov To: guix-patches@gnu.org Subject: [PATCH 0/1] services: agate: Change variable names and add system test. Date: Sun, 11 Aug 2024 18:32:22 +0400 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Debbugs-Cc: Florian Pelz , Ludovic Courtès , Matthew Trzcinski , Maxim Cournoyer Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=rodion.goritskov@gmail.com; helo=mail-ed1-x532.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Rodion Goritskov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This is a follow up to the patchset in [1], which updated the configuration record to make agate service work again. However, the original ticket had some improvement suggestions, so this patch addresses them. Short option names are renamed to a long ones, documentation is updated and system test added. Compatibility of the service breaks again, so it is not OK now, please notify me on deprecation policy, I will update the patchset accordingly. 1: https://issues.guix.gnu.org/71722 Rodion Goritskov (1): services: agate: Change variable names and add system test. doc/guix.texi | 8 ++-- gnu/services/web.scm | 38 ++++++++-------- gnu/tests/web.scm | 105 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 127 insertions(+), 24 deletions(-) base-commit: 174ecf5b1077d29498d9de22e27b13047f314feb -- 2.45.2 ------------=_1725124082-22448-1--