From be1c2c54d9f918f50f71c6d32a72d4498c07504c Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 9 Sep 2015 09:17:31 +0200
Subject: system: Make service procedures non-monadic.

* gnu/services/avahi.scm (configuration-file): Use 'plain-file' instead
  of 'text-file'.
  (avahi-service): Turn into a regular procedure that returns a <service>.
* gnu/services/base.scm (root-file-system-service, file-system-service,
  user-unmount-service, user-processes-service, host-name-service,
  console-keymap-service, console-font-service, mingetty-service,
  nscd.conf-file, nscd-service): Likewise.
  (%default-syslog.conf): New variable.
  (syslog-service): Use it.  Turn into a regular procedure.
  (guix-service, udev-rules-union, kvm-udev-rule, udev-service,
  device-mapping-service, swap-service): Likewise.
* gnu/services/databases.scm (%default-postgres-hba,
  %default-postgres-ident): Use 'plain-file' instead of 'text-file'.
  (%default-postgres-config): Use 'mixed-text-file' instead of
  'text-file*'.
  (postgresql-service):  Use 'program-file' instead of 'gexp->script'.
  Turn into a regular procedure.
* gnu/services/desktop.scm (dbus-configuration-directory): Use
  'computed-file' instead of 'gexp->derivation'.
  (upower-configuration-file, geoclue-configuration-file,
  elogind-configuration-file): Use 'plain-file' instead of 'text-file'.
  (dbus-service, upower-service, colord-service, geoclue-service,
  polkit-service, elogind-service): Turn into regular procedures.
  (%desktop-services): Remove use of 'mlet' when iterating on
  %BASE-SERVICES.
* gnu/services/lirc.scm (lirc-service): Turn into a regular procedure.
* gnu/services/networking.scm (static-networking-service,
  dhcp-client-service, ntp-service, tor-service, bitlbee-service,
  wicd-service): Likewise.
* gnu/services/ssh.scm (lsh-service): Likewise.
* gnu/services/web.scm (nginx-service): Likewise.
* gnu/services/xorg.scm (xorg-configuration-file): Use 'mixed-text-file'
  instead of 'text-file*'.
  (xorg-start-command, slim-service): Turn into regular procedures.
  (xinitrc): Use 'program-file' instead of 'gexp->script'.
* gnu/system/install.scm (cow-store-service,
  configuration-template-service): Turn into regular procedures.
* gnu/system.scm (other-file-system-services, device-mapping-services,
  swap-services, essential-services, operating-system-services,
  user-shells, operating-system-accounts): Remove now unnecessary
  'mlet' and turn into regular procedures.
  (operating-system-etc-directory, operating-system-activation-script,
  operating-system-boot-script): Adjust accordingly.
* doc/guix.texi (Base Services, Networking Services, X Window, Desktop
  Services, Database Services, Web Services, Various Services, Name
  Service Switch): Adjust accordingly.
---
 gnu/services/web.scm | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

(limited to 'gnu/services/web.scm')

diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 2db5b76ce4..c6b4153d05 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -22,7 +22,6 @@
   #:use-module (gnu packages admin)
   #:use-module (gnu packages web)
   #:use-module (guix records)
-  #:use-module (guix monads)
   #:use-module (guix store)
   #:use-module (guix gexp)
   #:export (nginx-service))
@@ -76,22 +75,20 @@ files in LOG-DIRECTORY, and stores temporary runtime files in RUN-DIRECTORY."
   (define nologin #~(string-append #$shadow "/sbin/nologin"))
 
   ;; TODO: Add 'reload' action.
-  (mbegin %store-monad
-    (return
-     (service
-      (provision '(nginx))
-      (documentation "Run the nginx daemon.")
-      (requirement '(user-processes loopback))
-      (start (nginx-action "-p" run-directory))
-      (stop (nginx-action "-s" "stop"))
-      (activate activate)
-      (user-groups (list (user-group
-                          (name "nginx")
-                          (system? #t))))
-      (user-accounts (list (user-account
-                            (name "nginx")
-                            (group "nginx")
-                            (system? #t)
-                            (comment "nginx server user")
-                            (home-directory "/var/empty")
-                            (shell nologin))))))))
+  (service
+   (provision '(nginx))
+   (documentation "Run the nginx daemon.")
+   (requirement '(user-processes loopback))
+   (start (nginx-action "-p" run-directory))
+   (stop (nginx-action "-s" "stop"))
+   (activate activate)
+   (user-groups (list (user-group
+                       (name "nginx")
+                       (system? #t))))
+   (user-accounts (list (user-account
+                         (name "nginx")
+                         (group "nginx")
+                         (system? #t)
+                         (comment "nginx server user")
+                         (home-directory "/var/empty")
+                         (shell nologin))))))
-- 
cgit v1.2.3