summaryrefslogtreecommitdiff
path: root/gnu/services/avahi.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-09-09 09:17:31 +0200
committerLudovic Courtès <ludo@gnu.org>2015-10-10 22:46:14 +0200
commitbe1c2c54d9f918f50f71c6d32a72d4498c07504c (patch)
tree642d087516b3ae7c2ffad6444e25b410712c92be /gnu/services/avahi.scm
parentce8a6dfc43265787c23fb93d3877fbcacb0451e4 (diff)
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.
Diffstat (limited to 'gnu/services/avahi.scm')
-rw-r--r--gnu/services/avahi.scm88
1 files changed, 43 insertions, 45 deletions
diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm
index a3ca5ab6fb..929ac2fbb6 100644
--- a/gnu/services/avahi.scm
+++ b/gnu/services/avahi.scm
@@ -21,7 +21,6 @@
#:use-module (gnu system shadow)
#:use-module (gnu packages avahi)
#:use-module (gnu packages admin)
- #:use-module (guix monads)
#:use-module (guix store)
#:use-module (guix gexp)
#:export (avahi-service))
@@ -39,21 +38,21 @@
(define (bool value)
(if value "yes\n" "no\n"))
- (text-file "avahi-daemon.conf"
- (string-append
- "[server]\n"
- (if host-name
- (string-append "host-name=" host-name "\n")
- "")
+ (plain-file "avahi-daemon.conf"
+ (string-append
+ "[server]\n"
+ (if host-name
+ (string-append "host-name=" host-name "\n")
+ "")
- "browse-domains=" (string-join domains-to-browse)
- "\n"
- "use-ipv4=" (bool ipv4?)
- "use-ipv6=" (bool ipv6?)
- "[wide-area]\n"
- "enable-wide-area=" (bool wide-area?)
- "[publish]\n"
- "disable-publishing=" (bool (not publish?)))))
+ "browse-domains=" (string-join domains-to-browse)
+ "\n"
+ "use-ipv4=" (bool ipv4?)
+ "use-ipv6=" (bool ipv6?)
+ "[wide-area]\n"
+ "enable-wide-area=" (bool wide-area?)
+ "[publish]\n"
+ "disable-publishing=" (bool (not publish?)))))
(define* (avahi-service #:key (avahi avahi)
host-name
@@ -76,37 +75,36 @@ When @var{wide-area?} is true, DNS-SD over unicast DNS is enabled.
Boolean values @var{ipv4?} and @var{ipv6?} determine whether to use IPv4/IPv6
sockets."
- (mlet %store-monad ((config (configuration-file #:host-name host-name
- #:publish? publish?
- #:ipv4? ipv4?
- #:ipv6? ipv6?
- #:wide-area? wide-area?
- #:domains-to-browse
- domains-to-browse)))
- (return
- (service
- (documentation "Run the Avahi mDNS/DNS-SD responder.")
- (provision '(avahi-daemon))
- (requirement '(dbus-system networking))
+ (let ((config (configuration-file #:host-name host-name
+ #:publish? publish?
+ #:ipv4? ipv4?
+ #:ipv6? ipv6?
+ #:wide-area? wide-area?
+ #:domains-to-browse
+ domains-to-browse)))
+ (service
+ (documentation "Run the Avahi mDNS/DNS-SD responder.")
+ (provision '(avahi-daemon))
+ (requirement '(dbus-system networking))
- (start #~(make-forkexec-constructor
- (list (string-append #$avahi "/sbin/avahi-daemon")
- "--syslog" "-f" #$config)))
- (stop #~(make-kill-destructor))
- (activate #~(begin
- (use-modules (guix build utils))
- (mkdir-p "/var/run/avahi-daemon")))
+ (start #~(make-forkexec-constructor
+ (list (string-append #$avahi "/sbin/avahi-daemon")
+ "--syslog" "-f" #$config)))
+ (stop #~(make-kill-destructor))
+ (activate #~(begin
+ (use-modules (guix build utils))
+ (mkdir-p "/var/run/avahi-daemon")))
- (user-groups (list (user-group
- (name "avahi")
- (system? #t))))
- (user-accounts (list (user-account
- (name "avahi")
- (group "avahi")
- (system? #t)
- (comment "Avahi daemon user")
- (home-directory "/var/empty")
- (shell
- #~(string-append #$shadow "/sbin/nologin")))))))))
+ (user-groups (list (user-group
+ (name "avahi")
+ (system? #t))))
+ (user-accounts (list (user-account
+ (name "avahi")
+ (group "avahi")
+ (system? #t)
+ (comment "Avahi daemon user")
+ (home-directory "/var/empty")
+ (shell
+ #~(string-append #$shadow "/sbin/nologin"))))))))
;;; avahi.scm ends here