[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 fd85447b295e1aa5bd82650d7245767d1d5fb6d8..792dedd5aa4ef53677a241d53f98fe94366f7661 100644 (file)
--- 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 065b3761c2acca96f538a8050d8ff91b5063ef7e..744ce3155c1a0018f9f022a8bf10127f223294db 100644 (file)
--- 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.