summary refs log tree commit diff
diff options
context:
space:
mode:
authorClément Lassieur <clement@lassieur.org>2017-02-26 19:54:52 +0100
committerClément Lassieur <clement@lassieur.org>2017-03-12 01:30:23 +0100
commiteba560765a5afccbc5d3b64df410d89b1f79a18e (patch)
treeae682196f60f536bdc4bc7c2decc684530b46d98
parenta5935d1946c42a91218c20dba5e1c4cdc396ced6 (diff)
downloadguix-eba560765a5afccbc5d3b64df410d89b1f79a18e.tar.gz
services: dovecot: Fix unix_listeners and fifo_listeners path types.
* gnu/services/mail.scm (unix-listener-configuration)[path]
(fifo-listener-configuration)[path]: Change type from 'file-name' to 'string'.
* doc/guix.texi (Mail Services): Document it.

Signed-off-by: Clément Lassieur <clement@lassieur.org>
-rw-r--r--doc/guix.texi10
-rw-r--r--gnu/services/mail.scm10
2 files changed, 12 insertions, 8 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 93d0b7a084..ddfd707665 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10930,8 +10930,9 @@ Defaults to @samp{()}.
 
 Available @code{unix-listener-configuration} fields are:
 
-@deftypevr {@code{unix-listener-configuration} parameter} file-name path
-The file name on which to listen.
+@deftypevr {@code{unix-listener-configuration} parameter} string path
+Path to the file, relative to @code{base-dir} field.  This is also used as
+the section name.
 @end deftypevr
 
 @deftypevr {@code{unix-listener-configuration} parameter} string mode
@@ -10952,8 +10953,9 @@ Defaults to @samp{""}.
 
 Available @code{fifo-listener-configuration} fields are:
 
-@deftypevr {@code{fifo-listener-configuration} parameter} file-name path
-The file name on which to listen.
+@deftypevr {@code{fifo-listener-configuration} parameter} string path
+Path to the file, relative to @code{base-dir} field.  This is also used as
+the section name.
 @end deftypevr
 
 @deftypevr {@code{fifo-listener-configuration} parameter} string mode
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index b211ab61a5..dbc5de9e62 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -165,8 +165,9 @@
 
 (define-configuration unix-listener-configuration
   (path
-   (file-name (configuration-missing-field 'unix-listener 'path))
-   "The file name on which to listen.")
+   (string (configuration-missing-field 'unix-listener 'path))
+   "Path to the file, relative to @code{base-dir} field.  This is also used as
+the section name.")
   (mode
    (string "0600")
    "The access mode for the socket.")
@@ -184,8 +185,9 @@
 
 (define-configuration fifo-listener-configuration
   (path
-   (file-name (configuration-missing-field 'fifo-listener 'path))
-   "The file name on which to listen.")
+   (string (configuration-missing-field 'fifo-listener 'path))
+   "Path to the file, relative to @code{base-dir} field.  This is also used as
+the section name.")
   (mode
    (string "0600")
    "The access mode for the socket.")