all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [PATCH] services: Add opensmtpd-service.
@ 2016-11-19  7:29 宋文武
  2016-11-23 22:24 ` Ludovic Courtès
  0 siblings, 1 reply; 5+ messages in thread
From: 宋文武 @ 2016-11-19  7:29 UTC (permalink / raw)
  To: guix-devel; +Cc: 宋文武

* gnu/services/mail.scm (<opensmtpd-configuration>): New record type.
(%default-opensmtpd-config-file, %opensmtpd-accounts): New variables.
(opensmtpd-shepherd-service, opensmtpd-activation): New procedures.
(opensmtpd-service-type): New variable.
(opensmtpd-service): New procedure.
* doc/guix.texi (Mail Services): Document it.
---
 doc/guix.texi         | 37 +++++++++++++++-----
 gnu/services/mail.scm | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 120 insertions(+), 10 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 0e70830..34ac0b9 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9996,16 +9996,9 @@ For MariaDB, the root password is empty.
 @cindex mail
 @cindex email
 The @code{(gnu services mail)} module provides Guix service definitions
-for mail services.  Currently the only implemented service is Dovecot,
-an IMAP, POP3, and LMTP server.
+for following mail services:
 
-Guix does not yet have a mail transfer agent (MTA), although for some
-lightweight purposes the @code{esmtp} relay-only MTA may suffice.  Help
-is needed to properly integrate a full MTA, such as Postfix.  Patches
-welcome!
-
-To add an IMAP/POP3 server to a GuixSD system, add a
-@code{dovecot-service} to the operating system definition:
+@subsubheading Dovecot Service
 
 @deffn {Scheme Procedure} dovecot-service [#:config (dovecot-configuration)]
 Return a service that runs the Dovecot IMAP/POP3/LMTP mail server.
@@ -11361,6 +11354,32 @@ could instantiate a dovecot service like this:
                   (string "")))
 @end example
 
+@subsubheading OpenSMTPD Service
+
+@deffn {Scheme Procedure} opensmtpd-service [#:config (opensmtpd-configuration)]
+Return a service that runs the @command{smtpd} daemon of OpenSMTPD
+package, an implementation of SMTP server as defined by RFC 5321.
+
+The optional @var{config} argument specifies the configuration for
+@command{smtpd}, which should be a @code{<opensmtpd-configuration>}
+object, by default it listens on the loopback network interface, and
+allows for mail from users and daemons on the local machine, as well as
+permitting email to remote servers.
+@end deffn
+
+@deftp {Data Type} opensmtpd-configuraiton
+Data type regresenting the configuraiton of opensmtpd.
+
+@table @asis
+@item @code{package} (default: @var{opensmtpd})
+Package object of the OpenSMTPD SMTP server.
+
+@item @code{config-file} (default: @var{%default-opensmtpd-file})
+File-like object of the OpenSMTPD configuration file to use.  Run
+@command{man smtpd.conf} for more information.
+
+@end table
+@end deftp
 
 @node Kerberos Services
 @subsubsection Kerberos Services
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index cb0f119..94b4c62 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -51,7 +51,12 @@
             protocol-configuration
             plugin-configuration
             mailbox-configuration
-            namespace-configuration))
+            namespace-configuration
+
+            opensmtpd-configuration
+            opensmtpd-service
+            opensmtpd-service-type
+            %default-opensmtpd-config-file))
 
 ;;; Commentary:
 ;;;
@@ -1691,3 +1696,89 @@ by @code{dovecot-configuration}.  @var{config} may also be created by
             (format #t "@end deftypevr\n\n")))
         fields))))
   (generate 'dovecot-configuration))
+
+\f
+;;;
+;;; OpenSMTPD.
+;;;
+
+(define-record-type* <opensmtpd-configuration>
+  opensmtpd-configuration make-opensmtpd-configuration
+  opensmtpd-configuration?
+  (package     opensmtpd-configuration-package
+               (default opensmtpd))
+  (config-file opensmtpd-configuration-config-file
+               (default %default-opensmtpd-config-file)))
+
+(define %default-opensmtpd-config-file
+  (plain-file "smtpd.conf" "
+listen on lo
+accept from any for local deliver to mbox
+accept from local for any relay
+"))
+
+(define opensmtpd-shepherd-service
+  (match-lambda
+    (($ <opensmtpd-configuration> package config-file)
+     (list (shepherd-service
+            (provision '(smtpd))
+            (requirement '(networking))
+            (documentation "Run the OpenSMTPD daemon.")
+            (start (let ((smtpd (file-append package "/sbin/smtpd")))
+                     #~(make-forkexec-constructor
+                        (list #$smtpd "-f" #$config-file)
+                        #:pid-file "/var/run/smtpd.pid")))
+            (stop #~(make-kill-destructor)))))))
+
+(define %opensmtpd-accounts
+  (list (user-group
+         (name "smtpq")
+         (system? #t))
+        (user-account
+         (name "smtpd")
+         (group "nogroup")
+         (system? #t)
+         (comment "SMTP Daemon")
+         (home-directory "/var/empty")
+         (shell (file-append shadow "/sbin/nologin")))
+        (user-account
+         (name "smtpq")
+         (group "smtpq")
+         (system? #t)
+         (comment "SMTPD Queue")
+         (home-directory "/var/empty")
+         (shell (file-append shadow "/sbin/nologin")))))
+
+(define opensmtpd-activation
+  (match-lambda
+    (($ <opensmtpd-configuration> package config-file)
+     (let ((smtpd (file-append package "/sbin/smtpd")))
+       #~(begin
+           ;; Create the mbox directory.
+           (mkdir-p "/var/mail")
+           ;; Check the configuration file for validity.
+           (system* #$smtpd "-n" "-f" #$config-file))))))
+
+(define opensmtpd-service-type
+  (service-type
+   (name 'opensmtpd)
+   (extensions
+    (list (service-extension account-service-type
+                             (const %opensmtpd-accounts))
+          (service-extension activation-service-type
+                             opensmtpd-activation)
+          (service-extension profile-service-type
+                             (compose list opensmtpd-configuration-package))
+          (service-extension shepherd-root-service-type
+                             opensmtpd-shepherd-service)))))
+
+(define* (opensmtpd-service #:key (config (opensmtpd-configuration)))
+  "Return a service that runs the @command{smtpd} daemon of OpenSMTPD package,
+an implementation of SMTP server as defined by RFC 5321.
+
+The optional @var{config} argument specifies the configuration for
+@command{smtpd}, which should be a @code{<opensmtpd-configuration>} object, by
+default it listens on the loopback network interface, and allows for mail from
+users and daemons on the local machine, as well as permitting email to remote
+servers."
+  (service opensmtpd-service-type config))
-- 
2.10.0

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-11-27  2:23 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-19  7:29 [PATCH] services: Add opensmtpd-service 宋文武
2016-11-23 22:24 ` Ludovic Courtès
2016-11-24 14:10   ` 宋文武
2016-11-26 18:33     ` Ludovic Courtès
2016-11-27  2:22       ` 宋文武

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.