[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/8] Rename default system configuration file.
From: |
Alex Kost |
Subject: |
[PATCH 5/8] Rename default system configuration file. |
Date: |
Mon, 25 Jan 2016 13:50:18 +0300 |
* 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
- [PATCH 1/8] tests: misbehaved-client: Rename 'dmd' to 'root'., (continued)
- [PATCH 1/8] tests: misbehaved-client: Rename 'dmd' to 'root'., Alex Kost, 2016/01/25
- [PATCH 3/8] ChangeLog: Rename git repository., Alex Kost, 2016/01/25
- [PATCH 4/8] support: Rename 'make-dmd-user-module' to 'make-user-module'., Alex Kost, 2016/01/25
- [PATCH 6/8] support: Rename state file., Alex Kost, 2016/01/25
- [PATCH 5/8] Rename default system configuration file.,
Alex Kost <=
- [PATCH 7/8] utils: Rename 'dmd-gettext.scm' to 'shepherd-gettext.scm'., Alex Kost, 2016/01/25
[PATCH 8/8] Replace "dmd" with "shepherd" in comments and strings., Alex Kost, 2016/01/25