From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 25 Apr 2017 10:56:12 +0000 (+0200)
Subject: [master] Unify the socket file paths for CA and servers.
X-Git-Tag: trac5212_base~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b30f1095b757c5e15ae583138526fd152f61480d;p=thirdparty%2Fkea.git

[master] Unify the socket file paths for CA and servers.

Okayed on jabber.
---

diff --git a/src/bin/keactrl/kea-ca.conf.pre b/src/bin/keactrl/kea-ca.conf.pre
index fd85447b29..792dedd5aa 100644
--- a/src/bin/keactrl/kea-ca.conf.pre
+++ b/src/bin/keactrl/kea-ca.conf.pre
@@ -11,11 +11,11 @@
         "control-sockets": {
             "dhcp4-server": {
                 "socket-type": "unix",
-                "socket-name": "/tmp/kea-ctrl-dhcp4.sock"
+                "socket-name": "/tmp/kea-dhcp4-ctrl.sock"
             },
             "dhcp6-server": {
                 "socket-type": "unix",
-                "socket-name": "/tmp/kea-ctrl-dhcp6.sock"
+                "socket-name": "/tmp/kea-dhcp6-ctrl.sock"
             }
         },
 
diff --git a/src/bin/keactrl/kea.conf.pre b/src/bin/keactrl/kea.conf.pre
index 065b3761c2..744ce3155c 100644
--- a/src/bin/keactrl/kea.conf.pre
+++ b/src/bin/keactrl/kea.conf.pre
@@ -45,7 +45,7 @@
     // more. For detailed description, see Sections 8.8, 16 and 15.
     "control-socket": {
         "socket-type": "unix",
-        "socket-name": "/tmp/kea4-ctrl-socket.sock"
+        "socket-name": "/tmp/kea-dhcp4-ctrl.sock"
     },
 
     // Use Memfile lease database backend to store leases in a CSV file.
@@ -427,7 +427,7 @@
     // description, see Sections 9.12, 16 and 15.
     "control-socket": {
         "socket-type": "unix",
-        "socket-name": "/tmp/kea6-ctrl-socket.sock"
+        "socket-name": "/tmp/kea-dhcp6-ctrl.sock"
     },
 
     // Use Memfile lease database backend to store leases in a CSV file.