Commit Diff
Diff:
f30e60fd621c1e0e102d9440a2c7cb51054ae940
83a58d4e02c480146b7c1debc7500cd4ddb5298c
Commit:
83a58d4e02c480146b7c1debc7500cd4ddb5298c
Tree:
0d0e7c1f68017798e6df7e4e9a15235dabb6010a
Author:
pjp <pjp@delphinusdns.org>
Committer:
pjp <pjp@delphinusdns.org>
Date:
Fri Sep 20 09:51:43 2019 UTC
Message:
change the configfile default from /etc/delphinusdns.conf to /etc/delphinusdns/delphinusdns.conf, making it more compatible with how things are done in OpenBSD and possibly other OS's. not tested.
blob - 65a113191dc715a21b993220242b8bc1059a8f64
blob + f8c68494ae6625ba03341f5f82970c9de1a2e5a4
--- README
+++ README
@@ -1,4 +1,4 @@
-$Id: README,v 1.33 2019/09/19 12:25:09 pjp Exp $
+$Id: README,v 1.34 2019/09/20 09:51:43 pjp Exp $
1. README
2. WHY DELPHINUSDNS?
@@ -60,8 +60,8 @@ make, followed by su'ing and make install. Delphinusd
By default installation the configuration file is not installed you need to
do this manually. Also by default the config file is specified as
-/etc/delphinusdns.conf this can be changed by adding the -f option to
-delphinusdnsd.
+/etc/delphinusdns/delphinusdns.conf this can be changed by adding the -f
+option to delphinusdnsd.
A sample config file exists with the sources. example7.conf was a real life
config once.
blob - 5dcbb7d2b0e8751fc2309f05f8e1dfa7c6970746
blob + 42949345c2ec355e65a9e17225f4b067cb56ae93
--- ddd-db.h
+++ ddd-db.h
@@ -27,7 +27,7 @@
*/
/*
- * $Id: ddd-db.h,v 1.20 2019/07/09 12:24:09 pjp Exp $
+ * $Id: ddd-db.h,v 1.21 2019/09/20 09:51:43 pjp Exp $
*/
#ifndef _DB_H
@@ -36,7 +36,7 @@
#include <sys/types.h>
#include <limits.h>
-#define CONFFILE "/etc/delphinusdns.conf"
+#define CONFFILE "/etc/delphinusdns/delphinusdns.conf"
#define DEFAULT_SOCKET 64
#define IMSG_HELLO_MESSAGE 0 /* hello the master process a few */
blob - 9f3f312fa65778aa0fb7d99ae2e00c9c7ffce863
blob + 7a33a369426d3f0df0dcad90ada29bbdbdbd5766
--- dddctl.c
+++ dddctl.c
@@ -27,7 +27,7 @@
*/
/*
- * $Id: dddctl.c,v 1.68 2019/07/05 08:14:50 pjp Exp $
+ * $Id: dddctl.c,v 1.69 2019/09/20 09:51:43 pjp Exp $
*/
#include <sys/param.h>
@@ -7500,7 +7500,7 @@ int
configtest(int argc, char *argv[])
{
ddDB *db;
- char *zonefile = "/etc/delphinusdns.conf";
+ char *zonefile = CONFFILE;
int ch, count = 0;
blob - 00785f4385421ef4e57ae078ad808387dc8fc041
blob + b393aef0aa663f0a2c24bc47872f4c863f87611b
--- delphinusdns.conf.5
+++ delphinusdns.conf.5
@@ -227,7 +227,7 @@ optbind = "bind" cidr-address ;
optdnssec = "dnssec" ;
.Ed
.Sh FILES
-.Pa /etc/delphinusdns.conf
+.Pa /etc/delphinusdns/delphinusdns.conf
.Sh SEE ALSO
.Xr dddctl 8 ,
.Xr delphinusdnsd 8
blob - e2d06c81662f81f170dcc8a19e0f48c9d9c44f0f
blob + ac17bbb8dfeb01c6fbc19a35241b57d7921a7eb7
--- delphinusdnsd.8
+++ delphinusdnsd.8
@@ -101,7 +101,7 @@ Specifies the socket path to use with
Be more verbose in debug mode. This shows configfile parsing logic.
.El
.Sh FILES
-.Pa /etc/delphinusdns.conf
+.Pa /etc/delphinusdns/delphinusdns.conf
.Sh SEE ALSO
.Xr delphinusdns.conf 5 ,
.Xr dddctl 8 ,
repomaster@centroid.eu