From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kAJgEusnd2YcwAAAqHPOHw:P1 (envelope-from ) for ; Sat, 22 Jun 2024 19:37:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id kAJgEusnd2YcwAAAqHPOHw (envelope-from ) for ; Sat, 22 Jun 2024 21:37:15 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="l1SmSi/H"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1719085035; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=DEZXbW9enrhmkK05bukDIGTMvHGu0wGW1/6B+pOS7Jo=; b=hePdMUQbB4ltCsmlLsMeJGKdpOBGePBw+Y4lNkVru9Sl0JYV7xC/SN3fkUnM/Qq5RHWApI AJVmYrijETcBZ9vueojZo2KFVumqLucxDOVVSZGmsFgy62R3JkA5S59oaYp3qOicHYF4Or A68n7MWr0WtV4M5uKnPGdE7MDQ+u9CR4uO+kbXergQU4M9Godv8lfNAzQ7CBT7KVQosN+R VGE9kjySI4GYM1r1/EVtUwi6RuXstNwcRZLz5P8hSWKdDfaoIpL/PHfuLcntQrGLjoxI2f fLLHxXqwwjYVyYFDmjTPzXv96zjTOT8l27ddQd/CzXerXYUeJOYoYtCqK6VQmQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1719085035; a=rsa-sha256; cv=none; b=MJNjdOlYXpekRaRn5KaQdNKN6LO2+6nZQRGtliq1SM/ZIvKDWlN1hHiUlP9XeiiT9T8OxW 4Lco26bwGgA6ovDbzJnHJEHgvc8SYdrcLWBnV3JP7hPb6UklFCRFIlkmR0oVP5rFMcKwoT qNSVeJydAaYxSmJuoOXomrS7sswZeBJTQqcSbbUS2B+JPgheCUX4VpsYrfy22+BnzpQ/yD cnL3MjvqYkNspqECX7lEq+24P8rV531ogJ2mwIUcgkoGdWo9h0U63X9NOrmkJgp+9LBbXy Qhp8Yewajaw2SGdIcT5nlGhdzwX13L9gl5gM6mhvoBDQChE0QI09oZOTHv5Z0w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="l1SmSi/H"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C189C62785 for ; Sat, 22 Jun 2024 21:37:14 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sL6Xo-0001Pq-Iz; Sat, 22 Jun 2024 15:37:04 -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 1sL6Xn-0001PZ-C5 for guix-patches@gnu.org; Sat, 22 Jun 2024 15:37:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sL6Xn-0000PG-2M for guix-patches@gnu.org; Sat, 22 Jun 2024 15:37:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sL6Xm-0001Q1-Hf for guix-patches@gnu.org; Sat, 22 Jun 2024 15:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71722] [PATCH 1/2] services: agate: Update options for compatibility with the current Agate version. Resent-From: Rodion Goritskov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Jun 2024 19:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71722 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71722@debbugs.gnu.org Cc: Rodion Goritskov Received: via spool by 71722-submit@debbugs.gnu.org id=B71722.17190849885384 (code B ref 71722); Sat, 22 Jun 2024 19:37:02 +0000 Received: (at 71722) by debbugs.gnu.org; 22 Jun 2024 19:36:28 +0000 Received: from localhost ([127.0.0.1]:57781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sL6XE-0001Om-4q for submit@debbugs.gnu.org; Sat, 22 Jun 2024 15:36:28 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:55418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sL6XC-0001OX-74 for 71722@debbugs.gnu.org; Sat, 22 Jun 2024 15:36:26 -0400 Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4217136a74dso25295795e9.2 for <71722@debbugs.gnu.org>; Sat, 22 Jun 2024 12:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719084920; x=1719689720; 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=DEZXbW9enrhmkK05bukDIGTMvHGu0wGW1/6B+pOS7Jo=; b=l1SmSi/HVtufRsa11SMwQXGVPFGdf1/s6+abIpA5ZN8U/YJrSSeQPyoSU94rtpZLWc J+GgevysznJoVcpaXsR7ATmNCeXJnT030xnQ50KdAZkNakO9gxxxRnTp6ZleyA+pPu3K 5DuY7VbAZxKI7Es97YSMAL8n0nmXbsF50Ha7ZhKH3UOvhNVjYbth+Wy3bnI+ScnEkItm 4uTFI/gK+WL7VE9Ohgb1441582QIHT6XREg8YxPLnQ5iyeLSMinwjbD8ADS9Mmc2VVKt CFO06vGkEYtQeCm5gIXPchIRYQU9HZJxMwwLQ9CO2m3A+rkqePDBlY5V3aK9xn5BSwE4 DI5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719084920; x=1719689720; 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=DEZXbW9enrhmkK05bukDIGTMvHGu0wGW1/6B+pOS7Jo=; b=pWtF0dhtRgPbWznqryAmZXRBl8CVYvzzvg5ZKJL3o6Xpc0/TvKkBOqMPJ9+gDrey1I KrFwCgBFlBShIL07rJUzH6utakONFcpReBkLdO9pnfH3u8iUzGcDlKpm8a/8GOM+A7XD LdR3PQ/py/C+1He/88w+uENyvkO/o4Zf2VlILDd2phRGMYqY7619wrXppQy74zC5b6v9 VwjbQoS+hC07Bcp5YdtDYmtQWL+U+H0y5fhKarshbyxvAjSHFI9cabDOsBKUVpsVDVXp IUOsoUMk7pVlU3RgHYox9Bw6e3s5XXQypSS6C+nXnCNQgPgBRmydG26Vmr5uMQdrZIOp +GPg== X-Gm-Message-State: AOJu0YyCkHGf2YVPV4a3elWUsd9vp7tg0vPkb/KPU6VZIUGH18/oiy9u a6xdTMsytEUaGM9bOxHw8gZgZMvVJLOd6nemKw3tj8Tr/LJ0oedKLU4lVA== X-Google-Smtp-Source: AGHT+IELER+RrEr/4D5Nty3aT/dYtBFQ8CJyc6y0G2QX40PA3OtNJBrTZBa9Ik8efgXShcxyeROy+g== X-Received: by 2002:a5d:59a8:0:b0:365:aad:2f5f with SMTP id ffacd0b85a97d-366e9569f3fmr450734f8f.29.1719084918857; Sat, 22 Jun 2024 12:35:18 -0700 (PDT) Received: from bumblebee-mighty.lan ([92.51.75.166]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-366389b8ab0sm5433576f8f.27.2024.06.22.12.35.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 12:35:18 -0700 (PDT) From: Rodion Goritskov Date: Sat, 22 Jun 2024 23:33:54 +0400 Message-ID: <258b03236418dc733802f4834f02565755063e76.1719082137.git.rodion.goritskov@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: C189C62785 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -4.76 X-Spam-Score: -4.76 X-TUID: RLo9LRbbwAv0 * gnu/services/web.scm ()[certs]: Add. * gnu/services/web.scm ()[cert]: Remove. * gnu/services/web.scm ()[key]: Remove. * gnu/services/web.scm ()[hostname]: Change from string to list. * gnu/services/web.scm ()[silent?]: Remove. * gnu/services/web.scm ()[only-tls13?]: Add. * gnu/services/web.scm ()[central-conf?]: Add. * gnu/services/web.scm ()[ed25519?]: Add. * gnu/services/web.scm ()[skip-port-check?]: Add. * gnu/services/web.scm (agate-shepherd-service): Change handling of addr and hostname, add new options handling. Change-Id: Ibc83a7254d1e425604d4aa0b95cbaa74fc9c72eb --- gnu/services/web.scm | 50 +++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 406117c457..1ee1fff9ed 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -302,13 +302,15 @@ (define-module (gnu services web) agate-configuration? agate-configuration-package agate-configuration-content - agate-configuration-cert - agate-configuration-key + agate-configuration-certs agate-configuration-addr agate-configuration-hostname agate-configuration-lang - agate-configuration-silent + agate-configuration-only-tls13 agate-configuration-serve-secret + agate-configuration-central-conf + agate-configuration-ed25519 + agate-configuration-skip-port-check agate-configuration-log-ip agate-configuration-user agate-configuration-group @@ -2177,20 +2179,24 @@ (define-record-type* (default agate)) (content agate-configuration-content (default "/srv/gemini")) - (cert agate-configuration-cert - (default #f)) - (key agate-configuration-key - (default #f)) + (certs agate-configuration-certs + (default "/srv/gemini-certs")) (addr agate-configuration-addr (default '("0.0.0.0:1965" "[::]:1965"))) (hostname agate-configuration-hostname - (default #f)) + (default '())) (lang agate-configuration-lang (default #f)) - (silent? agate-configuration-silent - (default #f)) + (only-tls13? agate-configuration-only-tls13 + (default #f)) (serve-secret? agate-configuration-serve-secret (default #f)) + (central-conf? agate-configuration-central-conf + (default #f)) + (ed25519? agate-configuration-ed25519 + (default #f)) + (skip-port-check? agate-configuration-skip-port-check + (default #f)) (log-ip? agate-configuration-log-ip (default #t)) (user agate-configuration-user @@ -2202,8 +2208,10 @@ (define-record-type* (define agate-shepherd-service (match-lambda - (($ package content cert key addr - hostname lang silent? serve-secret? + (($ package content certs addr + hostname lang only-tls13? + serve-secret? central-conf? + ed25519? skip-port-check? log-ip? user group log-file) (list (shepherd-service (provision '(agate)) @@ -2213,17 +2221,21 @@ (define agate-shepherd-service #~(make-forkexec-constructor (list #$agate "--content" #$content - "--cert" #$cert - "--key" #$key - "--addr" #$@addr + "--certs" #$certs + #$@(append-map + (lambda x (append '("--addr") x)) + addr) + #$@(append-map + (lambda x (append '("--hostname") x)) + hostname) #$@(if lang (list "--lang" lang) '()) - #$@(if hostname - (list "--hostname" hostname) - '()) - #$@(if silent? '("--silent") '()) #$@(if serve-secret? '("--serve-secret") '()) + #$@(if only-tls13? '("--only-tls13") '()) + #$@(if central-conf? '("--central-conf") '()) + #$@(if ed25519? '("--ed25519") '()) + #$@(if skip-port-check? '("--skip-port-check") '()) #$@(if log-ip? '("--log-ip") '())) #:user #$user #:group #$group #:log-file #$log-file))) -- 2.45.1