From: Alex Kost <alezost@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 5/8] Rename default system configuration file.
Date: Mon, 25 Jan 2016 13:50:18 +0300 [thread overview]
Message-ID: <1453719021-13836-6-git-send-email-alezost@gmail.com> (raw)
In-Reply-To: <1453719021-13836-1-git-send-email-alezost@gmail.com>
* modules/shepherd/support.scm (default-config-file): Rename
"dmdconf.scm" to "shepherd.conf.scm".
* shepherd.texi (Jump Start): Likewise.
---
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 562a87b..f161056 100644
--- a/modules/shepherd/support.scm
+++ b/modules/shepherd/support.scm
@@ -268,7 +268,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 "/dmdconf.scm")
+ (string-append %sysconfdir "/shepherd.conf.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 74cf584..29fbe02 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/dmdconf.scm}. When started as normal user, it
+tries to use @code{/etc/shepherd.conf.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/dmdconf.scm.old
-shepherd -c /etc/dmdconf.scm.old
+shepherd --config=/etc/shepherd.conf.scm.old
+shepherd -c /etc/shepherd.conf.scm.old
@end example
@cindex Starting a service
--
2.6.3
next prev parent reply other threads:[~2016-01-25 10:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-25 10:50 [SHEPHERD] [PATCH 0/8]: More dmd -> shepherd patches Alex Kost
2016-01-25 10:50 ` [PATCH 1/8] tests: misbehaved-client: Rename 'dmd' to 'root' Alex Kost
2016-01-25 15:07 ` Ludovic Courtès
2016-01-25 10:50 ` [PATCH 2/8] tests: Rename 'dmd_pid' to 'shepherd_pid' Alex Kost
2016-01-25 15:07 ` Ludovic Courtès
2016-01-25 10:50 ` [PATCH 3/8] ChangeLog: Rename git repository Alex Kost
2016-01-25 15:07 ` Ludovic Courtès
2016-01-25 10:50 ` [PATCH 4/8] support: Rename 'make-dmd-user-module' to 'make-user-module' Alex Kost
2016-01-25 15:08 ` Ludovic Courtès
2016-01-25 10:50 ` Alex Kost [this message]
2016-01-25 15:08 ` [PATCH 5/8] Rename default system configuration file Ludovic Courtès
2016-01-25 10:50 ` [PATCH 6/8] support: Rename state file Alex Kost
2016-01-25 15:11 ` Ludovic Courtès
2016-01-25 19:26 ` Efraim Flashner
2016-01-25 19:36 ` Efraim Flashner
2016-01-25 10:50 ` [PATCH 7/8] utils: Rename 'dmd-gettext.scm' to 'shepherd-gettext.scm' Alex Kost
2016-01-25 15:12 ` Ludovic Courtès
2016-01-25 15:59 ` Alex Kost
2016-01-25 21:51 ` Ludovic Courtès
2016-01-26 9:42 ` Alex Kost
2016-01-25 10:50 ` [PATCH 8/8] Replace "dmd" with "shepherd" in comments and strings Alex Kost
2016-01-25 15:13 ` Ludovic Courtès
2016-01-25 16:14 ` Alex Kost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453719021-13836-6-git-send-email-alezost@gmail.com \
--to=alezost@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.