unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / Atom feed
* [bug#43347] [PATCH] services: dovecot: Do not require dovecot to be globally installed.
@ 2020-09-11 19:40 Pierre Langlois
  2020-09-11 21:02 ` Julien Lepiller
  2020-09-11 21:33 ` Tobias Geerinckx-Rice via Guix-patches via
  0 siblings, 2 replies; 5+ messages in thread
From: Pierre Langlois @ 2020-09-11 19:40 UTC (permalink / raw)
  To: 43347


[-- Attachment #1.1: Type: text/plain, Size: 535 bytes --]

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 #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 519 bytes --]

[-- Attachment #2: 0001-services-dovecot-Do-not-require-dovecot-to-be-global.patch --]
[-- Type: text/x-patch, Size: 2436 bytes --]

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(-)

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


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#43347] [PATCH] services: dovecot: Do not require dovecot to be globally installed.
  2020-09-11 19:40 [bug#43347] [PATCH] services: dovecot: Do not require dovecot to be globally installed Pierre Langlois
@ 2020-09-11 21:02 ` Julien Lepiller
  2020-09-11 21:33 ` Tobias Geerinckx-Rice via Guix-patches via
  1 sibling, 0 replies; 5+ messages in thread
From: Julien Lepiller @ 2020-09-11 21:02 UTC (permalink / raw)
  To: 43347, pierre.langlois

[-- Attachment #1: Type: text/plain, Size: 1177 bytes --]

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 :
>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 #2: Type: text/html, Size: 1454 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#43347] [PATCH] services: dovecot: Do not require dovecot to be globally installed.
  2020-09-11 19:40 [bug#43347] [PATCH] services: dovecot: Do not require dovecot to be globally installed Pierre Langlois
  2020-09-11 21:02 ` Julien Lepiller
@ 2020-09-11 21:33 ` Tobias Geerinckx-Rice via Guix-patches via
  2020-09-11 21:50   ` bug#43347: " Pierre Langlois
  2020-09-12 15:06   ` [bug#43347] " Alexey Abramov
  1 sibling, 2 replies; 5+ messages in thread
From: Tobias Geerinckx-Rice via Guix-patches via @ 2020-09-11 21:33 UTC (permalink / raw)
  To: Pierre Langlois, 43347

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




^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#43347: [PATCH] services: dovecot: Do not require dovecot to be globally installed.
  2020-09-11 21:33 ` Tobias Geerinckx-Rice via Guix-patches via
@ 2020-09-11 21:50   ` Pierre Langlois
  2020-09-12 15:06   ` [bug#43347] " Alexey Abramov
  1 sibling, 0 replies; 5+ messages in thread
From: Pierre Langlois @ 2020-09-11 21:50 UTC (permalink / raw)
  To: Tobias Geerinckx-Rice; +Cc: Pierre Langlois, 43347-done

[-- Attachment #1: Type: text/plain, Size: 1732 bytes --]


Tobias Geerinckx-Rice writes:

> 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.

>> 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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 519 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#43347] [PATCH] services: dovecot: Do not require dovecot to be globally installed.
  2020-09-11 21:33 ` Tobias Geerinckx-Rice via Guix-patches via
  2020-09-11 21:50   ` bug#43347: " Pierre Langlois
@ 2020-09-12 15:06   ` Alexey Abramov
  1 sibling, 0 replies; 5+ messages in thread
From: Alexey Abramov @ 2020-09-12 15:06 UTC (permalink / raw)
  To: me, pierre.langlois, 43347

[-- Attachment #1: Type: text/plain, Size: 1701 bytes --]

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:

> 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 #2: Type: text/html, Size: 3648 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-09-14  7:14 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-11 19:40 [bug#43347] [PATCH] services: dovecot: Do not require dovecot to be globally installed Pierre Langlois
2020-09-11 21:02 ` Julien Lepiller
2020-09-11 21:33 ` Tobias Geerinckx-Rice via Guix-patches via
2020-09-11 21:50   ` bug#43347: " Pierre Langlois
2020-09-12 15:06   ` [bug#43347] " Alexey Abramov

unofficial mirror of guix-patches@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix-patches/1 guix-patches/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 guix-patches guix-patches/ https://yhetil.org/guix-patches \
		guix-patches@gnu.org
	public-inbox-index guix-patches

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://news.yhetil.org/yhetil.gnu.guix.patches


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git