From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 05 15:40:14 2020 Received: (at submit) by debbugs.gnu.org; 5 Mar 2020 20:40:15 +0000 Received: from localhost ([127.0.0.1]:43774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9xHu-0006UV-5k for submit@debbugs.gnu.org; Thu, 05 Mar 2020 15:40:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:55473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9xHs-0006UJ-8w for submit@debbugs.gnu.org; Thu, 05 Mar 2020 15:40:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45761) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9xHq-0003aW-Uq for guix-patches@gnu.org; Thu, 05 Mar 2020 15:40:08 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9xHp-0002BN-Lo for guix-patches@gnu.org; Thu, 05 Mar 2020 15:40:06 -0500 Received: from minsky.hcoop.net ([104.248.1.95]:46058) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9xHp-0002Au-Hm for guix-patches@gnu.org; Thu, 05 Mar 2020 15:40:05 -0500 Received: from lib-its13.lib.duke.edu ([152.3.118.151] helo=localhost.localdomain) by minsky.hcoop.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1j9xHi-0002gX-HM; Thu, 05 Mar 2020 15:39:58 -0500 From: Jack Hill To: guix-patches@gnu.org Subject: [PATCH] services: certbot: Add server option. Date: Thu, 5 Mar 2020 15:39:48 -0500 Message-Id: <20200305203948.2998-1-jackhill@jackhill.us> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 104.248.1.95 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: submit Cc: Jack Hill , Tobias Geerinckx-Rice 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: -0.8 (/) * gnu/services/certbot.scm (certbot-configuration): Add server option. (certbot-command): Use server option. (certbot-actication): Use server option. (certbot-nginx-server-configurations): Use server option. * doc/guix.texi (Certificate Services): Document server option. Co-authored-by: Tobias Geerinckx-Rice --- doc/guix.texi | 5 +++++ gnu/services/certbot.scm | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index fab9159530..2278cb6a53 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -74,6 +74,7 @@ Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2020 Wiktor Żelazny@* Copyright @copyright{} 2020 Damien Cassou@* Copyright @copyright{} 2020 Jakub Kądziołka@* +Copyright @copyright{} 2020 Jack Hill@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -21008,6 +21009,10 @@ and several @code{domains}. Mandatory email used for registration, recovery contact, and important account notifications. +@item @code{server} (default: @code{#f}) +Optional URL of ACME server. Setting this overrides certbot's default, +which is the Let's Encrypt server. + @item @code{rsa-key-size} (default: @code{2048}) Size of the RSA key. diff --git a/gnu/services/certbot.scm b/gnu/services/certbot.scm index 0d3be03383..3e005918d6 100644 --- a/gnu/services/certbot.scm +++ b/gnu/services/certbot.scm @@ -3,6 +3,8 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2019 Julien Lepiller +;;; Copyright © 2020 Jack Hill +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -70,6 +72,8 @@ (certificates certbot-configuration-certificates (default '())) (email certbot-configuration-email) + (server certbot-configuration-server + (default #f)) (rsa-key-size certbot-configuration-rsa-key-size (default #f)) (default-location certbot-configuration-default-location @@ -82,7 +86,7 @@ (define certbot-command (match-lambda (($ package webroot certificates email - rsa-key-size default-location) + server rsa-key-size default-location) (let* ((certbot (file-append package "/bin/certbot")) (rsa-key-size (and rsa-key-size (number->string rsa-key-size))) (commands @@ -101,6 +105,7 @@ "--cert-name" name "--manual-public-ip-logging-ok" "-d" (string-join domains ",")) + (if server `("--server" ,server) '()) (if rsa-key-size `("--rsa-key-size" ,rsa-key-size) '()) (if authentication-hook `("--manual-auth-hook" ,authentication-hook) @@ -113,6 +118,7 @@ "--webroot" "-w" webroot "--cert-name" name "-d" (string-join domains ",")) + (if server `("--server" ,server) '()) (if rsa-key-size `("--rsa-key-size" ,rsa-key-size) '()) (if deploy-hook `("--deploy-hook" ,deploy-hook) '())))))) certificates))) @@ -142,7 +148,7 @@ (message (format #f (G_ "~a may need to be run~%") script))) (match config (($ package webroot certificates email - rsa-key-size default-location) + server rsa-key-size default-location) (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils)) @@ -154,7 +160,7 @@ (define certbot-nginx-server-configurations (match-lambda (($ package webroot certificates email - rsa-key-size default-location) + server rsa-key-size default-location) (list (nginx-server-configuration (listen '("80" "[::]:80")) -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 08 16:19:17 2020 Received: (at 39934-done) by debbugs.gnu.org; 8 Mar 2020 20:19:18 +0000 Received: from localhost ([127.0.0.1]:49318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jB2OL-0004T8-Mf for submit@debbugs.gnu.org; Sun, 08 Mar 2020 16:19:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jB2OK-0004Sv-6n for 39934-done@debbugs.gnu.org; Sun, 08 Mar 2020 16:19:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:58815) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jB2OE-00068O-Ho; Sun, 08 Mar 2020 16:19:10 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36546 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jB2OC-0006XH-7u; Sun, 08 Mar 2020 16:19:08 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Jack Hill Subject: Re: [bug#39934] [PATCH] services: certbot: Add server option. References: <20200305203948.2998-1-jackhill@jackhill.us> Date: Sun, 08 Mar 2020 21:19:06 +0100 In-Reply-To: <20200305203948.2998-1-jackhill@jackhill.us> (Jack Hill's message of "Thu, 5 Mar 2020 15:39:48 -0500") Message-ID: <8736aia9c5.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 39934-done Cc: Tobias Geerinckx-Rice , 39934-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: -1.7 (-) Hi, Jack Hill skribis: > * gnu/services/certbot.scm (certbot-configuration): Add server option. > (certbot-command): Use server option. > (certbot-actication): Use server option. > (certbot-nginx-server-configurations): Use server option. > * doc/guix.texi (Certificate Services): Document server option. > > Co-authored-by: Tobias Geerinckx-Rice Applied, thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 09 00:40:15 2020 Received: (at 39934-done) by debbugs.gnu.org; 9 Mar 2020 04:40:15 +0000 Received: from localhost ([127.0.0.1]:49650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBAD9-0007vs-FX for submit@debbugs.gnu.org; Mon, 09 Mar 2020 00:40:15 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:37384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBAD7-0007ve-Qz for 39934-done@debbugs.gnu.org; Mon, 09 Mar 2020 00:40:14 -0400 Received: from marsh.hcoop.net ([45.55.52.66]) by minsky.hcoop.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1jBACv-0002fJ-Ij; Mon, 09 Mar 2020 00:40:01 -0400 Date: Mon, 9 Mar 2020 00:40:01 -0400 (EDT) From: Jack Hill X-X-Sender: jackhill@marsh.hcoop.net To: =?ISO-8859-15?Q?Ludovic_Court=E8s?= Subject: Re: bug#39934: [PATCH] services: certbot: Add server option. In-Reply-To: <8736aia9c5.fsf@gnu.org> Message-ID: References: <20200305203948.2998-1-jackhill@jackhill.us> <8736aia9c5.fsf@gnu.org> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="925712948-909962566-1583728801=:19733" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 39934-done Cc: Tobias Geerinckx-Rice , 39934-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: -1.0 (-) This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --925712948-909962566-1583728801=:19733 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8BIT On Sun, 8 Mar 2020, Ludovic Courtès wrote: > Applied, thanks! Awesome, thank you both. Best, Jack --925712948-909962566-1583728801=:19733-- From unknown Fri Jun 20 07:23:16 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 06 Apr 2020 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator