summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@igalia.com>2016-09-04 18:01:40 +0200
committerAndy Wingo <wingo@igalia.com>2016-09-27 14:45:07 +0200
commit66329c23a113201de2ead168a400cc068caafc85 (patch)
treed35ac17d4992262b158c55b6660b28e653ed722e
parenta777535cd7399c06d2eb036f926689778f44be73 (diff)
downloadguix-66329c23a113201de2ead168a400cc068caafc85.tar.gz
gnu: New default Dovecot service postmaster_address
* gnu/services/mail.scm (dovecot-configuration): Change default for
  postmaster-address, as dovecot is now requiring a non-empty value and
  will fail to start up otherwise.
* doc/guix.texi (Mail Services): Update.
-rw-r--r--doc/guix.texi4
-rw-r--r--gnu/services/mail.scm2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 808fbdceb4..c159e12b1b 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9964,8 +9964,8 @@ Defaults to @samp{""}.
 
 @deftypevr {@code{dovecot-configuration} parameter} string postmaster-address
 Address to use when sending rejection mails.
-Default is postmaster@@<your domain>.  %d expands to recipient domain.
-Defaults to @samp{""}.
+%d expands to recipient domain.
+Defaults to @samp{"postmaster@@%d"}.
 @end deftypevr
 
 @deftypevr {@code{dovecot-configuration} parameter} string hostname
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index d94532c353..cb0f119f43 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -1352,7 +1352,7 @@ regeneration entirely.")
    "SSL crypto device to use, for valid values run \"openssl engine\".")
 
   (postmaster-address
-   (string "")
+   (string "postmaster@%d")
    "Address to use when sending rejection mails.
 Default is postmaster@@<your domain>.  %d expands to recipient domain.")