snape pushed a commit to branch master
in repository guix.
commit eba560765a5afccbc5d3b64df410d89b1f79a18e
Author: Clément Lassieur <[email protected]>
Date: Sun Feb 26 19:54:52 2017 +0100
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 <[email protected]>
---
doc/guix.texi | 10 ++++++----
gnu/services/mail.scm | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 93d0b7a..ddfd707 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 b211ab6..dbc5de9 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.")
