;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
(define-module (gnu services avahi)
#:use-module (gnu services)
#:use-module (gnu services base)
- #:use-module (gnu services dmd)
+ #:use-module (gnu services shepherd)
#:use-module (gnu services dbus)
#:use-module (gnu system shadow)
#:use-module (gnu packages avahi)
#:use-module (gnu packages admin)
#:use-module (guix records)
#:use-module (guix gexp)
- #:export (avahi-service))
+ #:export (avahi-configuration
+ avahi-service
+ avahi-service-type))
;;; Commentary:
;;;
avahi-configuration?
(avahi avahi-configuration-avahi ;<package>
(default avahi))
+ (debug? avahi-configuration-debug? ;Boolean
+ (default #f))
(host-name avahi-configuration-host-name) ;string
(publish? avahi-configuration-publish?) ;Boolean
(ipv4? avahi-configuration-ipv4?) ;Boolean
(system? #t)
(comment "Avahi daemon user")
(home-directory "/var/empty")
- (shell #~(string-append #$shadow "/sbin/nologin")))))
+ (shell (file-append shadow "/sbin/nologin")))))
(define %avahi-activation
;; Activation gexp.
(use-modules (guix build utils))
(mkdir-p "/var/run/avahi-daemon")))
-(define (avahi-dmd-service config)
- "Return a list of <dmd-service> for CONFIG."
+(define (avahi-shepherd-service config)
+ "Return a list of <shepherd-service> for CONFIG."
(let ((config (configuration-file config))
+ (debug? (avahi-configuration-debug? config))
(avahi (avahi-configuration-avahi config)))
- (list (dmd-service
+ (list (shepherd-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)))
+ "--daemonize"
+ #$@(if debug? #~("--debug") #~())
+ "-f" #$config)
+ #:pid-file "/var/run/avahi-daemon/pid"))
(stop #~(make-kill-destructor))))))
(define avahi-service-type
(let ((avahi-package (compose list avahi-configuration-avahi)))
(service-type (name 'avahi)
(extensions
- (list (service-extension dmd-root-service-type
- avahi-dmd-service)
+ (list (service-extension shepherd-root-service-type
+ avahi-shepherd-service)
(service-extension dbus-root-service-type
avahi-package)
(service-extension account-service-type
(service-extension profile-service-type
avahi-package))))))
-(define* (avahi-service #:key (avahi avahi)
+(define* (avahi-service #:key (avahi avahi) debug?
host-name
(publish? #t)
(ipv4? #t) (ipv6? #t)
sockets."
(service avahi-service-type
(avahi-configuration
- (avahi avahi) (host-name host-name)
+ (avahi avahi) (debug? debug?) (host-name host-name)
(publish? publish?) (ipv4? ipv4?) (ipv6? ipv6?)
(wide-area? wide-area?)
(domains-to-browse domains-to-browse))))