[shepherd] 01/05: Rename state directory and log file.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository shepherd.

commit 18adb8bc1486f57142cfba1316dae910654fe661
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jan 12 22:05:15 2016 +0100

    Rename state directory and log file.
    
    * Makefile.am (install-data-local): Change "/run/dmd" to
    "/run/shepherd".
    * modules/shepherd/support.scm (%system-socket-dir): Likewise.
    (default-logfile): Change "dmd.log" to "shepherd.log".
    * shepherd.texi: Adjust accordingly.
---
 Makefile.am                  |    4 ++--
 modules/shepherd/support.scm |    6 +++---
 shepherd.texi                |   14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3ab81b4..7cf9196 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,8 +65,8 @@ EXTRA_DIST = $(templates) QUESTIONS fdl-1.3.texi 
ChangeLog-2003
 # accessible only by its owner since otherwise 'shepherd' suggests using
 # '--insecure'.  This is just a convenience, so allow it to fail.
 install-data-local:
-       -$(MKDIR_P) $(DESTDIR)$(localstatedir)/run/dmd
-       -chmod 700 $(DESTDIR)$(localstatedir)/run/dmd
+       -$(MKDIR_P) $(DESTDIR)$(localstatedir)/run/shepherd
+       -chmod 700 $(DESTDIR)$(localstatedir)/run/shepherd
 
 # Relocate the script---i.e., have them refer to the installed module
 # directory.
diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
index dada505..df7c988 100644
--- a/modules/shepherd/support.scm
+++ b/modules/shepherd/support.scm
@@ -226,8 +226,8 @@ TARGET should be a string representing a filepath + name."
 ;; Logfile.
 (define default-logfile
   (if (zero? (getuid))
-      (string-append %localstatedir "/log/dmd.log")
-      (string-append user-dmddir "/dmd.log")))
+      (string-append %localstatedir "/log/shepherd.log")
+      (string-append user-dmddir "/shepherd.log")))
 
 ;; Configuration file.
 (define (default-config-file)
@@ -244,7 +244,7 @@ create a template configuration file if non exists."
 
 ;; Socket directory for the system's instance (PID 1).
 (define %system-socket-dir
-  (string-append %localstatedir "/run/dmd"))
+  (string-append %localstatedir "/run/shepherd"))
 
 ;; The directory where the socket resides.
 (define default-socket-dir
diff --git a/shepherd.texi b/shepherd.texi
index 57fc0d3..71796c3 100644
--- a/shepherd.texi
+++ b/shepherd.texi
@@ -157,7 +157,7 @@ As the final ``d'' suggests, @command{shepherd} is just
 a daemon that (usually) runs in the
 background, so you will not interact with it directly.  After it is
 started, @command{shepherd} will listen on a socket special file, usually
address@hidden/var/run/dmd/socket}, for further commands.  You use the tool
address@hidden/var/run/shepherd/socket}, for further commands.  You use the tool
 @dfn{deco} to send these commands to @command{shepherd}.  Usage of deco is 
simple and
 straightforward: To start a service called @code{apache}, you use:
 
@@ -396,8 +396,8 @@ permissions are not as expected.
 @cindex logging
 @cindex log file
 Log output into @var{file}, or if @var{file} is not given,
address@hidden/var/log/dmd.log} when running as superuser, @var{~/.dmd.log}
-otherwise.
address@hidden/var/log/shepherd.log} when running as superuser,
address@hidden/.dmd.d/shepherd.log} otherwise.
 
 @item address@hidden
 When @command{shepherd} is ready to accept connections, write its PID to 
@var{file} or
@@ -411,7 +411,7 @@ to the standard output if @var{file} is omitted.
 @itemx address@hidden
 @cindex socket special file
 Receive further commands on the socket special file @var{file}.  If
-this option is not specified, @address@hidden/run/dmd/socket} is
+this option is not specified, @address@hidden/run/shepherd/socket} is
 taken.
 
 If @code{-} is specified as file name, commands will be read from
@@ -461,7 +461,7 @@ The @code{deco} command understands the following option:
 @item -s @var{file}
 @itemx address@hidden
 Send commands to the socket special file @var{file}. If this option is
-not specified, @address@hidden/run/dmd/socket} is taken.
+not specified, @address@hidden/run/shepherd/socket} is taken.
 
 @end table
 
@@ -487,7 +487,7 @@ command understands the following option:
 @item -s @var{file}
 @itemx address@hidden
 Send commands to the socket special file @var{file}. If this option is
-not specified, @address@hidden/run/dmd/socket} is taken.
+not specified, @address@hidden/run/shepherd/socket} is taken.
 
 @end table
 
@@ -513,7 +513,7 @@ It is equivalent to running @command{deco power-off dmd}.  
As usual, the
 @item -s @var{file}
 @itemx address@hidden
 Send commands to the socket special file @var{file}. If this option is
-not specified, @address@hidden/run/dmd/socket} is taken.
+not specified, @address@hidden/run/shepherd/socket} is taken.
 
 @end table