From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id wPs9KWlPOl+/GwAA0tVLHw (envelope-from ) for ; Mon, 17 Aug 2020 09:35:37 +0000 Received: from aspmx2.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id WD8WJWlPOl9wRAAAB5/wlQ (envelope-from ) for ; Mon, 17 Aug 2020 09:35:37 +0000 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 aspmx2.migadu.com (Postfix) with ESMTPS id 4EC36681309 for ; Mon, 17 Aug 2020 09:33:21 +0000 (UTC) Received: from localhost ([::1]:48888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7bV5-0005hD-9v for larch@yhetil.org; Mon, 17 Aug 2020 05:32:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7bUo-0005JF-Su for guix-patches@gnu.org; Mon, 17 Aug 2020 05:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47749) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7bUo-0001ix-Iq for guix-patches@gnu.org; Mon, 17 Aug 2020 05:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k7bUo-0003fC-Fx for guix-patches@gnu.org; Mon, 17 Aug 2020 05:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH 03/10] services: dovecot: Use modules via symlink to system profile. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Aug 2020 09:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.159765669713981 (code B ref 42899); Mon, 17 Aug 2020 09:32:02 +0000 Received: (at 42899) by debbugs.gnu.org; 17 Aug 2020 09:31:37 +0000 Received: from localhost ([127.0.0.1]:59278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7bUP-0003dO-EP for submit@debbugs.gnu.org; Mon, 17 Aug 2020 05:31:37 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:36371) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7bUJ-0003c9-OE for 42899@debbugs.gnu.org; Mon, 17 Aug 2020 05:31:32 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id 073C09CFDB for <42899@debbugs.gnu.org>; Mon, 17 Aug 2020 09:00:44 +0000 (UTC) From: Alexey Abramov Date: Mon, 17 Aug 2020 11:31:17 +0200 Message-Id: <20200817093124.30611-3-levenson@mmer.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200817093124.30611-1-levenson@mmer.org> References: <20200817093124.30611-1-levenson@mmer.org> 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 X-Spam-Score: -1.0 (-) 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" X-Scanner: scn0 Authentication-Results: aspmx2.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx2.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: xA08QllIfAPi * gnu/services/mail.scm (%dovecot-activation): Link the location with multiple plugins (dovecot-pigeonhole, etc), to a place where dovecot can find them. * gnu/services/mail.scm (dovecot-configuration): Use the symlink. Signed-off-by: Alexey Abramov --- gnu/services/mail.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index cfcaf4601b..da17933d6b 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -1044,7 +1044,7 @@ directories are prefixed with the chroot directory, append \"/.\" to This is used by imap (for shared users) and lda.") (mail-plugin-dir - (file-name "/usr/lib/dovecot") + (file-name "/etc/dovecot/modules") "Directory where to look up mail plugins.") (mail-plugins @@ -1519,13 +1519,16 @@ greyed out, instead of only later giving \"not selectable\" popup error. (else (format (current-error-port) "Failed to create public key at ~a.\n" public-key))))) - (let ((user (getpwnam "dovecot"))) + (let ((user (getpwnam "dovecot")) + (moduledir "/etc/dovecot/modules")) (mkdir-p/perms "/var/run/dovecot" user #o755) (mkdir-p/perms "/var/lib/dovecot" user #o755) (mkdir-p/perms "/etc/dovecot" user #o755) (copy-file #$(plain-file "dovecot.conf" config-str) "/etc/dovecot/dovecot.conf") (mkdir-p/perms "/etc/dovecot/private" user #o700) + (unless (file-exists? moduledir) + (symlink "/run/current-system/profile/lib/dovecot" moduledir)) (create-self-signed-certificate-if-absent #:private-key "/etc/dovecot/private/default.pem" #:public-key "/etc/dovecot/default.pem" -- 2.27.0