[#795] sockets paths unified between examples and default configs

doc/examples/agent/comments.json

@@ -18,7 +18,7 @@
             {
                 "comment": "control socket for DHCP4 server",
                 "socket-type": "unix",
-                "socket-name": "/path/to/the/unix/socket-v4"
+                "socket-name": "/tmp/kea4-ctrl-socket"
             }
         },
 

doc/examples/agent/simple.json

@@ -32,21 +32,21 @@
             {
                 "comment": "socket to DHCP4 server",
                 "socket-type": "unix",
-                "socket-name": "/path/to/the/unix/socket-v4"
+                "socket-name": "/tmp/kea4-ctrl-socket"
             },
 
             // Location of the DHCPv6 command channel socket.
             "dhcp6":
             {
                 "socket-type": "unix",
-                "socket-name": "/path/to/the/unix/socket-v6"
+                "socket-name": "/tmp/kea6-ctrl-socket"
             },
 
             // Location of the D2 command channel socket.
             "d2":
             {
                 "socket-type": "unix",
-                "socket-name": "/path/to/the/unix/socket-d2",
+                "socket-name": "/tmp/kea-ddns-ctrl-socket",
                 "user-context": { "in-use": false }
             }
         },

doc/examples/ddns/comments.json

@@ -16,7 +16,7 @@
     {
         "comment": "Control channel",
         "socket-type": "unix",
-        "socket-name": "/tmp/d2-ctrl-socket"
+        "socket-name": "/tmp/kea-ddns-ctrl-socket"
     },
 
     "forward-ddns":

doc/examples/ddns/sample1.json

@@ -36,7 +36,7 @@
     "control-socket":
     {
         "socket-type": "unix",
-        "socket-name": "/tmp/d2-ctrl-socket"
+        "socket-name": "/tmp/kea-ddns-ctrl-socket"
     },
 
 //

doc/examples/ddns/template.json

@@ -25,7 +25,7 @@
 //    "control-socket":
 //    {
 //        "socket-type": "unix",
-//        "socket-name": "/tmp/d2-ctrl-socket"
+//        "socket-name": "/tmp/kea-ddns-ctrl-socket"
 //    },
 
 //

doc/examples/kea4/all-keys-netconf.json

@@ -91,7 +91,7 @@
             // Location of the unix domain socket file the DHCPv4 server uses
             // to receive control commands from the Kea Control Agent or the
             // local server administrator.
-            "socket-name": "/tmp/kea-dhcp4-ctrl.sock",
+            "socket-name": "/tmp/kea4-ctrl-socket",
 
             // Control socket type used by the Kea DHCPv4 server. The 'unix'
             // socket is currently the only supported type.

doc/examples/kea4/all-keys.json

@@ -91,7 +91,7 @@
             // Location of the unix domain socket file the DHCPv4 server uses
             // to receive control commands from the Kea Control Agent or the
             // local server administrator.
-            "socket-name": "/tmp/kea-dhcp4-ctrl.sock",
+            "socket-name": "/tmp/kea4-ctrl-socket",
 
             // Control socket type used by the Kea DHCPv4 server. The 'unix'
             // socket is currently the only supported type.

doc/examples/kea4/config-backend.json

@@ -50,7 +50,7 @@
     // details.
     "control-socket": {
         "socket-type": "unix",
-        "socket-name": "/tmp/kea-dhcp4.sock"
+        "socket-name": "/tmp/kea4-ctrl-socket"
     },
 
     // Hooks libraries that enable configuration backend are loaded.

doc/examples/kea4/ha-load-balancing-primary.json

@@ -23,7 +23,7 @@
     // API between the HA peers.
     "control-socket": {
         "socket-type": "unix",
-        "socket-name": "/tmp/kea-dhcp4-ctrl.sock"
+        "socket-name": "/tmp/kea4-ctrl-socket"
     },
 
     // Use Memfile lease database backend to store leases in a CSV file.

doc/examples/kea6/all-keys-netconf.json

@@ -56,7 +56,7 @@
             // Location of the unix domain socket file the DHCPv6 server uses
             // to receive control commands from the Kea Control Agent or the
             // local server administrator.
-            "socket-name": "/tmp/kea-dhcp6-ctrl.sock",
+            "socket-name": "/tmp/kea6-ctrl-socket",
 
             // Control socket type used by the Kea DHCPv6 server. The 'unix'
             // socket is currently the only supported type.

doc/examples/kea6/all-keys.json

@@ -56,7 +56,7 @@
             // Location of the unix domain socket file the DHCPv6 server uses
             // to receive control commands from the Kea Control Agent or the
             // local server administrator.
-            "socket-name": "/tmp/kea-dhcp6-ctrl.sock",
+            "socket-name": "/tmp/kea6-ctrl-socket",
 
             // Control socket type used by the Kea DHCPv6 server. The 'unix'
             // socket is currently the only supported type.

doc/examples/kea6/config-backend.json

@@ -50,7 +50,7 @@
     // details.
     "control-socket": {
         "socket-type": "unix",
-        "socket-name": "/tmp/kea-dhcp6.sock"
+        "socket-name": "/tmp/kea6-ctrl-socket"
     },
 
     // Hooks libraries that enable configuration backend are loaded.

doc/examples/kea6/ha-hot-standby.json

@@ -21,7 +21,7 @@
     // API between the HA peers.
     "control-socket": {
         "socket-type": "unix",
-        "socket-name": "/tmp/kea-dhcp6-ctrl.sock"
+        "socket-name": "/tmp/kea6-ctrl-socket"
     },
 
     // Use Memfile lease database backend to store leases in a CSV file.

doc/examples/netconf/comments.json

@@ -20,7 +20,7 @@
                 {
                     "comment": "using unix/local socket",
                     "socket-type": "unix",
-                    "socket-name": "/path/to/the/unix/socket-v4"
+                    "socket-name": "/tmp/kea4-ctrl-socket"
                 }
             }
         },

doc/examples/netconf/kea-dhcp6-operations/BAD-config.xml

@@ -12,7 +12,7 @@
     <interfaces>eth1</interfaces>
   </interfaces-config>
   <control-socket>
-    <socket-name>/tmp/kea6-sock</socket-name>
+    <socket-name>/tmp/kea6-ctrl-socket</socket-name>
     <socket-type>unix</socket-type>
   </control-socket>
 </config>

doc/examples/netconf/kea-dhcp6-operations/BAD-schema.xml

@@ -12,7 +12,7 @@
     <interfaces>eth1</interfaces>
   </interfaces-config>
   <control-socket>
-    <socket-name>/tmp/kea6-sock</socket-name>
+    <socket-name>/tmp/kea6-ctrl-socket</socket-name>
     <socket-type>unix</socket-type>
   </control-socket>
 </config>

doc/examples/netconf/kea-dhcp6-operations/BAD-translator.xml

@@ -12,7 +12,7 @@
     <interfaces>eth1</interfaces>
   </interfaces-config>
   <control-socket>
-    <socket-name>/tmp/kea6-sock</socket-name>
+    <socket-name>/tmp/kea6-ctrl-socket</socket-name>
     <socket-type>unix</socket-type>
   </control-socket>
   <user-context>bad</user-context>

doc/examples/netconf/kea-dhcp6-operations/boot.json

@@ -2,7 +2,7 @@
     "Dhcp6": {
         "control-socket": {
             "socket-type": "unix",
-            "socket-name": "/tmp/kea6-sock"
+            "socket-name": "/tmp/kea6-ctrl-socket"
         }
     }
 }

doc/examples/netconf/kea-dhcp6-operations/logging.xml

@@ -12,7 +12,7 @@
     <subnet>2001:db8::/64</subnet>
   </subnet6>
   <control-socket>
-    <socket-name>/tmp/kea6-sock</socket-name>
+    <socket-name>/tmp/kea6-ctrl-socket</socket-name>
     <socket-type>unix</socket-type>
   </control-socket>
   <logger>

doc/examples/netconf/kea-dhcp6-operations/netconf.json

@@ -8,7 +8,7 @@
                 "control-socket":
                 {
                     "socket-type": "unix",
-                    "socket-name": "/tmp/kea6-sock"
+                    "socket-name": "/tmp/kea6-ctrl-socket"
                 }
             }
         },

doc/examples/netconf/kea-dhcp6-operations/startup.xml

@@ -12,7 +12,7 @@
     <interfaces>eth1</interfaces>
   </interfaces-config>
   <control-socket>
-    <socket-name>/tmp/kea6-sock</socket-name>
+    <socket-name>/tmp/kea6-ctrl-socket</socket-name>
     <socket-type>unix</socket-type>
   </control-socket>
 </config>

doc/examples/netconf/kea-dhcp6-operations/twopools.xml

@@ -17,7 +17,7 @@
     <interfaces>eth1</interfaces>
   </interfaces-config>
   <control-socket>
-    <socket-name>/tmp/kea6-sock</socket-name>
+    <socket-name>/tmp/kea6-ctrl-socket</socket-name>
     <socket-type>unix</socket-type>
   </control-socket>
 </config>

doc/examples/netconf/kea-dhcp6-operations/twosubnets.xml

@@ -21,7 +21,7 @@
     <interfaces>eth1</interfaces>
   </interfaces-config>
   <control-socket>
-    <socket-name>/tmp/kea6-sock</socket-name>
+    <socket-name>/tmp/kea6-ctrl-socket</socket-name>
     <socket-type>unix</socket-type>
   </control-socket>
 </config>

src/bin/keactrl/kea-ctrl-agent.conf.pre

@@ -26,15 +26,15 @@
     "control-sockets": {
         "dhcp4": {
             "socket-type": "unix",
-            "socket-name": "/tmp/kea-dhcp4-ctrl.sock"
+            "socket-name": "/tmp/kea4-ctrl-socket"
         },
         "dhcp6": {
             "socket-type": "unix",
-            "socket-name": "/tmp/kea-dhcp6-ctrl.sock"
+            "socket-name": "/tmp/kea6-ctrl-socket"
         },
         "d2": {
             "socket-type": "unix",
-            "socket-name": "/tmp/kea-dhcp-ddns-ctrl.sock"
+            "socket-name": "/tmp/kea-ddns-ctrl-socket"
         }
     },
 

src/bin/keactrl/kea-dhcp-ddns.conf.pre

@@ -23,7 +23,7 @@
   "port": 53001,
   "control-socket": {
       "socket-type": "unix",
-      "socket-name": "/tmp/kea-dhcp-ddns-ctrl.sock"
+      "socket-name": "/tmp/ddns-ctrl-socket"
   },
   "tsig-keys": [],
   "forward-ddns" : {},

src/bin/keactrl/kea-dhcp4.conf.pre

@@ -49,7 +49,7 @@
     // more. For detailed description, see Sections 8.8, 16 and 15.
     "control-socket": {
         "socket-type": "unix",
-        "socket-name": "/tmp/kea-dhcp4-ctrl.sock"
+        "socket-name": "/tmp/kea4-ctrl-socket"
     },
 
     // Use Memfile lease database backend to store leases in a CSV file.

src/bin/keactrl/kea-dhcp6.conf.pre

@@ -43,7 +43,7 @@
     // description, see Sections 9.12, 16 and 15.
     "control-socket": {
         "socket-type": "unix",
-        "socket-name": "/tmp/kea-dhcp6-ctrl.sock"
+        "socket-name": "/tmp/kea6-ctrl-socket"
     },
 
     // Use Memfile lease database backend to store leases in a CSV file.

src/bin/keactrl/kea-netconf.conf.pre

@@ -30,13 +30,13 @@
         "dhcp4": {
             "control-socket": {
                 "socket-type": "unix",
-                "socket-name": "/tmp/kea-dhcp4-ctrl.sock"
+                "socket-name": "/tmp/kea4-ctrl-socket"
             }
         },
         "dhcp6": {
             "control-socket": {
                 "socket-type": "unix",
-                "socket-name": "/tmp/kea-dhcp6-ctrl.sock"
+                "socket-name": "/tmp/kea6-ctrl-socket"
             }
         }
     },