diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-09-11 22:19:02 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-09-11 22:38:08 +0200 |
| commit | d9d88c2ff0d367599d0a851ccf9377c4e21079d6 (patch) | |
| tree | bb72a752f3ccd10f375a89e50a0f7338bbbfd7ea | |
| parent | ef500f9be43a375aa306a67c3b5263d228e6c0c0 (diff) | |
| download | guix-d9d88c2ff0d367599d0a851ccf9377c4e21079d6.tar guix-d9d88c2ff0d367599d0a851ccf9377c4e21079d6.tar.gz | |
Revert "services: dovecot: Use modules via symlink to system profile."
This reverts commit bcfe0f0c1e9a2b91049d7c6c591c7f0c6a002c14 for now.
It breaks most current use(r)s of the Dovecot service and needs to be
combined with an extra modules configuration field of some kind.
See <https://issues.guix.gnu.org/43347>.
| -rw-r--r-- | doc/guix.texi | 3 | ||||
| -rw-r--r-- | gnu/services/mail.scm | 13 |
2 files changed, 4 insertions, 12 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index db2013c16b..a6e14ea177 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18625,8 +18625,7 @@ Defaults to @samp{"/var/run/dovecot/auth-userdb"}. @deftypevr {@code{dovecot-configuration} parameter} file-name mail-plugin-dir Directory where to look up mail plugins. -Defaults to @samp{"/etc/dovecot/modules"}, a union of all enabled mail -plugins. +Defaults to @samp{"/usr/lib/dovecot"}. @end deftypevr @deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list mail-plugins diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 291a2db8e1..71fa975b5d 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -988,10 +988,8 @@ directories are prefixed with the chroot directory, append \"/.\" to This is used by imap (for shared users) and lda.") (mail-plugin-dir - (file-name "/etc/dovecot/modules") - "Directory where to look up mail plugins. -Defaults to @samp{\"/etc/dovecot/modules\"}, a union of all enabled mail -plugins.") + (file-name "/usr/lib/dovecot") + "Directory where to look up mail plugins.") (mail-plugins (space-separated-string-list '()) @@ -1523,18 +1521,13 @@ 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")) - ;; This is Dovecot's term for the base directory for - ;; dynamically loadable modules. It supports only one. - (moduledir "/etc/dovecot/modules")) + (let ((user (getpwnam "dovecot"))) (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" |