From patchwork Tue Nov 7 15:04:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 56014 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5794527BBEA; Tue, 7 Nov 2023 15:06:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AA3E227BBE9 for ; Tue, 7 Nov 2023 15:06:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0Nes-0004kX-08; Tue, 07 Nov 2023 10:06:26 -0500 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 1r0Neq-0004k7-KI for guix-patches@gnu.org; Tue, 07 Nov 2023 10:06:24 -0500 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 1r0Neq-0001FI-CY for guix-patches@gnu.org; Tue, 07 Nov 2023 10:06:24 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r0NfR-0001X1-RV for guix-patches@gnu.org; Tue, 07 Nov 2023 10:07:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66935] [PATCH v2 2/4] services: dovecot: Add 'reopen action. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Nov 2023 15:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66935 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66935@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 66935-submit@debbugs.gnu.org id=B66935.16993695785798 (code B ref 66935); Tue, 07 Nov 2023 15:07:01 +0000 Received: (at 66935) by debbugs.gnu.org; 7 Nov 2023 15:06:18 +0000 Received: from localhost ([127.0.0.1]:43024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Nej-0001VS-RA for submit@debbugs.gnu.org; Tue, 07 Nov 2023 10:06:18 -0500 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:56738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Neg-0001VC-1I for 66935@debbugs.gnu.org; Tue, 07 Nov 2023 10:06:16 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id 1889820A4A for <66935@debbugs.gnu.org>; Tue, 7 Nov 2023 16:05:34 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 7F7AE8009A; Tue, 7 Nov 2023 16:05:34 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id aYYP52Ldc91I; Tue, 7 Nov 2023 16:05:34 +0100 (CET) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id DAD5B80092; Tue, 7 Nov 2023 16:05:33 +0100 (CET) From: Bruno Victal Date: Tue, 7 Nov 2023 15:04:50 +0000 Message-ID: <9d21fd72e0b3ca36325fa79872bcbd07bd330f0a.1699369492.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/mail.scm (dovecot-shepherd-service): Re-indent. Add 'reopen action. Change-Id: I333032ec6f8a451c22490e27910793410c63a6d6 --- gnu/services/mail.scm | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index b865a67630..0f287ab93e 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Kristofer Buffington ;;; Copyright © 2020 Jonathan Brielmaier +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -1575,14 +1576,28 @@ (define (dovecot-shepherd-service config) (let ((dovecot (if (opaque-dovecot-configuration? config) (opaque-dovecot-configuration-dovecot config) (dovecot-configuration-dovecot config)))) - (list (shepherd-service - (documentation "Run the Dovecot POP3/IMAP mail server.") - (provision '(dovecot)) - (requirement '(pam networking)) - (start #~(make-forkexec-constructor - (list #$(file-append dovecot "/sbin/dovecot") - "-F"))) - (stop #~(make-kill-destructor)))))) + (list + (shepherd-service + (documentation "Run the Dovecot POP3/IMAP mail server.") + (provision '(dovecot)) + (requirement '(pam networking)) + (start #~(make-forkexec-constructor + (list #$(file-append dovecot "/sbin/dovecot") + "-F"))) + (stop #~(make-kill-destructor)) + (actions + (list (shepherd-action + (name 'reopen) + (documentation "Re-open log files.") + (procedure + #~(lambda (pid) + (if pid + (begin + (kill pid SIGUSR1) + (format #t + "Issued SIGUSR1 to Service Dovecot (PID ~a)." + pid)) + (format #t "Service Dovecot is not running."))))))))))) (define %dovecot-pam-services (list (unix-pam-service "dovecot")))