01/01: gnu: New default Dovecot service postmaster_address

[Andy Wingo]

wingo pushed a commit to branch master
in repository guix.

commit 66329c23a113201de2ead168a400cc068caafc85
Author: Andy Wingo <address@hidden>
Date:   Sun Sep 4 18:01:40 2016 +0200

    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.
---
 doc/guix.texi         |    4 ++--
 gnu/services/mail.scm |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 808fbdc..c159e12 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9964,8 +9964,8 @@ Defaults to @samp{""}.
 
 @deftypevr address@hidden 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 address@hidden parameter} string hostname
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index d94532c..cb0f119 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 "address@hidden")
    "Address to use when sending rejection mails.
 Default is postmaster@@<your domain>.  %d expands to recipient domain.")