[PATCH] services: dovecot: Do not require dovecot to be globally installed.

Done

Details

4 participants

Julien Lepiller
Alexey Abramov
Tobias Geerinckx-Rice
Pierre Langlois

Owner: unassigned

Submitted by: Pierre Langlois

Severity: normal

Pierre Langlois wrote on 11 Sep 2020 21:40

Recipients:(name . Guix-patches)(address . guix-patches@gnu.org)

Message-ID:87k0x09k6h.fsf@gmx.com

Hello Guix!

I noticed recently my little dovecot mailserver failed to boot, I

tracked it down to our service installing a symlink as:

/etc/dovecot/modules -> /run/current-system/profile/lib/dovecot

However, I didn't have the dovecot package globally installed, the

service does not install it AFAICT.

We could extend the service to install dovecot into the global profile,

however instead we can just symlink /etc/dovecot/modules to the dovecot

package in the store directly.

Here's the patch to do that! WDYT?

Thanks,

Pierre

From a85def0a578bc1b53b8af5e524a5ea9ce18f8403 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Thu, 10 Sep 2020 23:25:02 +0100
Subject: [PATCH] services: dovecot: Do not require dovecot to be globally
 installed.

* gnu/services/mail.scm (%dovecot-activation): Unconditionally symlink
/etc/dovecot/modules to the dovecot package's /lib dir instead of
hardcoding /run/current-system/profile/lib.
---
 gnu/services/mail.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Toggle diff (38 lines)diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index 291a2db8e1..47f686852a 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
 ;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Kristofer Buffington <kristoferbuffington@gmail.com>
+;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1476,7 +1477,10 @@ greyed out, instead of only later giving \"not selectable\" popup error.
            (with-output-to-string
              (lambda ()
                (serialize-configuration config
-                                        dovecot-configuration-fields)))))))
+                                        dovecot-configuration-fields))))))
+         (dovecot (if (opaque-dovecot-configuration? config)
+                      (opaque-dovecot-configuration-dovecot config)
+                      (dovecot-configuration-dovecot config))))
     #~(begin
         (use-modules (guix build utils))
         (define (mkdir-p/perms directory owner perms)
@@ -1533,8 +1537,9 @@ greyed out, instead of only later giving \"not selectable\" popup error.
           (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))
+          (if (file-exists? moduledir)
+            (delete-file moduledir))
+          (symlink (string-append #$dovecot "/lib/dovecot") moduledir)
           (create-self-signed-certificate-if-absent
            #:private-key "/etc/dovecot/private/default.pem"
            #:public-key "/etc/dovecot/default.pem"
-- 
2.28.0

Julien Lepiller wrote on 11 Sep 2020 23:02

Recipients:

Message-ID:96C47DA4-5471-4010-AAA8-0355B1B8A0D2@lepiller.eu

Oh no, the reason for the symlink I think is that module packages could be installed in the same profile as dovecot to complement the directory. If you symlink it to dovecot, you can't install additional modules.

Instead, I would suggest to add an option to declare the set of additional modules. Create a union of this set of modules and dovecot itself, and symlink /etc/dovecot/modules to it (or confiqure dovecot to look into it directly, without using any global state, which is better in my opinion).

Le 11 septembre 2020 15:40:06 GMT-04:00, Pierre Langlois <pierre.langlois@gmx.com> a écrit :

Toggle quote (18 lines)>Hello Guix!
>
>I noticed recently my little dovecot mailserver failed to boot, I
>tracked it down to our service installing a symlink as:
>
>  /etc/dovecot/modules -> /run/current-system/profile/lib/dovecot
>
>However, I didn't have the dovecot package globally installed, the
>service does not install it AFAICT.
>
>We could extend the service to install dovecot into the global profile,
>however instead we can just symlink /etc/dovecot/modules to the dovecot
>package in the store directly.
>
>Here's the patch to do that! WDYT?
>
>Thanks,
>Pierre

Attachment: file

Tobias Geerinckx-Rice wrote on 11 Sep 2020 23:33

Recipients:

Message-ID:ba844fd0bb0dec2270d63098cd0ec944@tobias.gr

Pierre,

Thank you very much for the bug report.

On 2020-09-11 21:40, Pierre Langlois wrote:

Toggle quote (8 lines)

> I noticed recently my little dovecot mailserver failed to boot, I

> tracked it down to our service installing a symlink as:

> /etc/dovecot/modules -> /run/current-system/profile/lib/dovecot

> However, I didn't have the dovecot package globally installed, the

> service does not install it AFAICT.

Sorry, this is my fault. I've been slowly merging some Dovecot

improvements[0] into master.

While I'm happily replying from the latest Dovecot service, I run it in

an... idiosyncratic manner that had me write some glue code to test

these patches. I didn't realize that said glue was doing more work than

I, er, realized. Too much.

Toggle quote (4 lines)

> We could extend the service to install dovecot into the global profile,

> however instead we can just symlink /etc/dovecot/modules to the dovecot

> package in the store directly.

Nack. That just reverts to last week's monolithic Dovecot service that

doesn't support modules, but now with pointless indirection via /etc.

Nor should the service add anything to the system profile, or expect the

user to do so.

The fix is to add a ‘modules’ field to the service configuration that,

exactly like CUPS's ‘extensions’ field, adds module packages like

dovecot-pigeonhole to the union directory that /etc/dovecot/modules

points to.

Kind regards,

T G-R

Sent from a Web browser. Excuse or enjoy my brevity.

[0]: https://issues.guix.gnu.org/42899

Pierre Langlois wrote on 11 Sep 2020 23:50

Recipients:(name . Tobias Geerinckx-Rice)(address . me@tobias.gr)

Message-ID:878sdg6l0n.fsf@gmx.com

Tobias Geerinckx-Rice writes:

Toggle quote (19 lines)> Pierre,
>
> Thank you very much for the bug report.
>
> On 2020-09-11 21:40, Pierre Langlois wrote:
>> I noticed recently my little dovecot mailserver failed to boot, I
>> tracked it down to our service installing a symlink as:
>>   /etc/dovecot/modules -> /run/current-system/profile/lib/dovecot
>> However, I didn't have the dovecot package globally installed, the
>> service does not install it AFAICT.
>
> Sorry, this is my fault.  I've been slowly merging some Dovecot
> improvements[0] into master.
>
> While I'm happily replying from the latest Dovecot service, I run it
> in an... idiosyncratic manner that had me write some glue code to test 
> these patches.  I didn't realize that said glue was doing more work
> than I, er, realized.  Too much.

No worries! I see you've reverted the commits so I'll close this.

Toggle quote (14 lines)>> We could extend the service to install dovecot into the global profile,
>> however instead we can just symlink /etc/dovecot/modules to the dovecot
>> package in the store directly.
>
> Nack.  That just reverts to last week's monolithic Dovecot service
> that doesn't support modules, but now with pointless indirection via
> /etc.  Nor should the service add anything to the system profile, or
> expect the user to do so.
>
> The fix is to add a ‘modules’ field to the service configuration that,
> exactly like CUPS's ‘extensions’ field, adds module packages like 
> dovecot-pigeonhole to the union directory that /etc/dovecot/modules
> points to.

Ah I see, I wasn't aware of the dovecot modules, the indirection being
pointless with my changes should have been a hint there was something
wrong :-).

Thanks,
Pierre

Closed

Alexey Abramov wrote on 12 Sep 2020 17:06

Recipients:

Message-ID:17482da9c18.281d.da5dc967fe079fb386b94d5b80162893@mmer.org

Hi,

I see, let me try to fix this.

Alexey

On September 11, 2020 23:03:22 Tobias Geerinckx-Rice via Guix-patches via

<guix-patches@gnu.org> wrote:

Toggle quote (42 lines)> Pierre,
>
> Thank you very much for the bug report.
>
> On 2020-09-11 21:40, Pierre Langlois wrote:
>> I noticed recently my little dovecot mailserver failed to boot, I
>> tracked it down to our service installing a symlink as:
>>
>> /etc/dovecot/modules -> /run/current-system/profile/lib/dovecot
>>
>> However, I didn't have the dovecot package globally installed, the
>> service does not install it AFAICT.
>
> Sorry, this is my fault.  I've been slowly merging some Dovecot
> improvements[0] into master.
>
> While I'm happily replying from the latest Dovecot service, I run it in
> an... idiosyncratic manner that had me write some glue code to test
> these patches.  I didn't realize that said glue was doing more work than
> I, er, realized.  Too much.
>
>> We could extend the service to install dovecot into the global profile,
>> however instead we can just symlink /etc/dovecot/modules to the dovecot
>> package in the store directly.
>
> Nack.  That just reverts to last week's monolithic Dovecot service that
> doesn't support modules, but now with pointless indirection via /etc.
> Nor should the service add anything to the system profile, or expect the
> user to do so.
>
> The fix is to add a ‘modules’ field to the service configuration that,
> exactly like CUPS's ‘extensions’ field, adds module packages like
> dovecot-pigeonhole to the union directory that /etc/dovecot/modules
> points to.
>
> Kind regards,
>
> T G-R
>
> Sent from a Web browser. Excuse or enjoy my brevity.
>
> [0]: https://issues.guix.gnu.org/42899

Attachment: file

Your comment

This issue is archived.

To comment on this conversation send an email to 43347@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 43347

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date