[shepherd] 06/06: Default system-wide config file is now /etc/shepherd.scm.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository shepherd.

commit 83567c4e3d397024651b432b81347dd2c9968820
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jan 27 11:18:38 2016 +0100

    Default system-wide config file is now /etc/shepherd.scm.
    
    * modules/shepherd/support.scm (default-config-file): Remove ".conf".
    * shepherd.texi (Jump Start): Adjust accordingly.
---
 modules/shepherd/support.scm |    2 +-
 shepherd.texi                |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
index 83456bb..ba575d3 100644
--- a/modules/shepherd/support.scm
+++ b/modules/shepherd/support.scm
@@ -280,7 +280,7 @@ TARGET should be a string representing a filepath + name."
 global system configuration file when running as 'root'.  As a side effect,
 create a template configuration file if non exists."
   (if (zero? (getuid))
-      (string-append %sysconfdir "/shepherd.conf.scm")
+      (string-append %sysconfdir "/shepherd.scm")
       (let ((config-file (string-append %user-config-dir "/init.scm")))
         (mkdir-p %user-config-dir #o700)
         (if (not (file-exists? config-file))
diff --git a/shepherd.texi b/shepherd.texi
index a7f6ce0..a380c7e 100644
--- a/shepherd.texi
+++ b/shepherd.texi
@@ -141,7 +141,7 @@ mentioned below.
 @cindex Configuration file
 When @command{shepherd} gets started, it reads and evaluates a
 configuration file.  When it is started with superuser priviledges, it
-tries to use @code{/etc/shepherd.conf.scm}.  When started as normal user, it
+tries to use @code{/etc/shepherd.scm}.  When started as normal user, it
 looks for a file called @code{$XDG_CONFIG_HOME/shepherd/init.scm}.  If
 the @code{XDG_CONFIG_HOME} environment variable is not defined,
 @code{$HOME/.config/shepherd/init.scm} is used instead.  With the option
@@ -150,8 +150,8 @@ look instead.  So if you want to start @command{shepherd} 
with an
 alternative file, use one of the following commands:
 
 @example
-shepherd --config=/etc/shepherd.conf.scm.old
-shepherd -c /etc/shepherd.conf.scm.old
+shepherd --config=/etc/shepherd.scm.old
+shepherd -c /etc/shepherd.scm.old
 @end example
 
 @cindex Starting a service