04/04: Add 'guix-daemon.conf' job for Upstart.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit ad227484c3e1dc85488be76a23128e77ad0b33ff
Author: Mario Daniel Ruiz Saavedra <address@hidden>
Date:   Thu Nov 26 11:07:51 2015 -0500

    Add 'guix-daemon.conf' job for Upstart.
    
    * etc/guix-daemon.conf.in: New file.
    * daemon.am (CLEANFILES): Add etc/guix-daemon.conf.
      (upstartjobdir, nodist_upstartjob_DATA): New variables.
      (EXTRA_DIST): Add etc/guix-daemon.conf.in.
    * doc/guix.texi (Binary Installation, Build Environment Setup): Mention
      'guix-daemon.conf'.
    
    Signed-off-by: Mario Daniel Ruiz Saavedra <address@hidden>
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 .gitignore              |    1 +
 daemon.am               |   16 ++++++++++++++--
 doc/guix.texi           |    9 ++++++++-
 etc/guix-daemon.conf.in |   12 ++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6e8bfac..412d09c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,6 +125,7 @@ GTAGS
 /doc/os-config-desktop.texi
 /doc/*.1
 /etc/guix-daemon.service
+/etc/guix-daemon.conf
 /doc/images/bootstrap-graph.pdf
 /doc/images/coreutils-bag-graph.png
 /doc/images/coreutils-graph.png
diff --git a/daemon.am b/daemon.am
index f2cb0a4..f75eef2 100644
--- a/daemon.am
+++ b/daemon.am
@@ -21,7 +21,7 @@
 #
 
 BUILT_SOURCES += nix/libstore/schema.sql.hh
-CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service
+CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service etc/guix-daemon.conf
 
 noinst_LIBRARIES = libformat.a libutil.a libstore.a
 
@@ -191,11 +191,23 @@ etc/guix-daemon.service: etc/guix-daemon.service.in       
\
               "$(srcdir)/etc/guix-daemon.service.in" > "address@hidden"
        mv "address@hidden" "$@"
 
+# The '.conf' job for Upstart.
+upstartjobdir = $(libdir)/upstart/system
+nodist_upstartjob_DATA = etc/guix-daemon.conf
+
+etc/guix-daemon.conf: etc/guix-daemon.conf.in  \
+                        $(top_builddir)/config.status
+       $(MKDIR_P) "`dirname "$@"`"
+       $(SED) -e 's|@''bindir''@|$(bindir)|' <                         \
+              "$(srcdir)/etc/guix-daemon.conf.in" > "address@hidden"
+       mv "address@hidden" "$@"
+
 EXTRA_DIST +=                                  \
   nix/libstore/schema.sql                      \
   nix/AUTHORS                                  \
   nix/COPYING                                  \
-  etc/guix-daemon.service.in
+  etc/guix-daemon.service.in   \
+  etc/guix-daemon.conf.in
 
 AM_TESTS_ENVIRONMENT +=                                \
   top_builddir="$(abs_top_builddir)"
diff --git a/doc/guix.texi b/doc/guix.texi
index 8ecb7cc..b404453 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -366,6 +366,10 @@ On hosts using the systemd init system, drop
 @file{~root/.guix-profile/lib/systemd/system/guix-daemon.service} in
 @file{/etc/systemd/system}.
 
+Likewise, on hosts using the Upstart init system, drop
address@hidden/.guix-profile/lib/upstart/system/guix-daemon.conf} in
address@hidden/etc/init}.
+
 @item
 Make the @command{guix} command available to other users on the machine,
 for instance with:
@@ -554,7 +558,10 @@ parallel, as specified by the @option{--max-jobs} option
 following address@hidden your machine uses the systemd init system,
 dropping the @address@hidden/lib/systemd/system/guix-daemon.service}
 file in @file{/etc/systemd/system} will ensure that
address@hidden is automatically started.}:
address@hidden is automatically started.  Similarly, if your
+machine uses the Upstart init system, drop the
address@hidden@var{prefix}/lib/upstart/system/guix-daemon.conf}
+file in @file{/etc/init}.}:
 
 @example
 # guix-daemon --build-users-group=guixbuild
diff --git a/etc/guix-daemon.conf.in b/etc/guix-daemon.conf.in
new file mode 100644
index 0000000..8f833cb
--- /dev/null
+++ b/etc/guix-daemon.conf.in
@@ -0,0 +1,12 @@
+# This is a "job" for the Upstart init system to launch 'guix-daemon'.
+# Drop it in /etc/init to have 'guix-daemon' automatically started.
+
+description "Build daemon for GNU Guix"
+
+start on runlevel [2345]
+
+stop on runlevel [016]
+
+task
+
+exec @bindir@/guix-daemon --build-users-group=guixbuild