]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#795] sockets paths unified between examples and default configs
authorWlodek Wencel <wlodek@isc.org>
Mon, 9 Sep 2019 16:58:30 +0000 (18:58 +0200)
committerTomek Mrugalski <tomek@isc.org>
Fri, 25 Oct 2019 14:03:07 +0000 (10:03 -0400)
28 files changed:
doc/examples/agent/comments.json
doc/examples/agent/simple.json
doc/examples/ddns/comments.json
doc/examples/ddns/sample1.json
doc/examples/ddns/template.json
doc/examples/kea4/all-keys-netconf.json
doc/examples/kea4/all-keys.json
doc/examples/kea4/config-backend.json
doc/examples/kea4/ha-load-balancing-primary.json
doc/examples/kea6/all-keys-netconf.json
doc/examples/kea6/all-keys.json
doc/examples/kea6/config-backend.json
doc/examples/kea6/ha-hot-standby.json
doc/examples/netconf/comments.json
doc/examples/netconf/kea-dhcp6-operations/BAD-config.xml
doc/examples/netconf/kea-dhcp6-operations/BAD-schema.xml
doc/examples/netconf/kea-dhcp6-operations/BAD-translator.xml
doc/examples/netconf/kea-dhcp6-operations/boot.json
doc/examples/netconf/kea-dhcp6-operations/logging.xml
doc/examples/netconf/kea-dhcp6-operations/netconf.json
doc/examples/netconf/kea-dhcp6-operations/startup.xml
doc/examples/netconf/kea-dhcp6-operations/twopools.xml
doc/examples/netconf/kea-dhcp6-operations/twosubnets.xml
src/bin/keactrl/kea-ctrl-agent.conf.pre
src/bin/keactrl/kea-dhcp-ddns.conf.pre
src/bin/keactrl/kea-dhcp4.conf.pre
src/bin/keactrl/kea-dhcp6.conf.pre
src/bin/keactrl/kea-netconf.conf.pre

index b6a717740e4a9fb58180f42e0afdae51280db7cc..1f90e1ce559edb5bbb401eabd2d85c914665d816 100644 (file)
@@ -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"
             }
         },
 
index bcdd131fe040abe5ce7686f631f7f8bad235b103..7bde939e8f436fb6872f9c88874b13257080c21a 100644 (file)
             {
                 "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 }
             }
         },
index 8726affd9a396068d91f308a7a5fa3b7fa9dca58..a7717d17c83026d05a3bd2a0d37793673c1bcbf2 100644 (file)
@@ -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":
index 8de7b1b8b875588ec9ae7c5e6a2a21804675dc2f..bb7668e5a01d89f262df8826534cc026dc68b823 100644 (file)
@@ -36,7 +36,7 @@
     "control-socket":
     {
         "socket-type": "unix",
-        "socket-name": "/tmp/d2-ctrl-socket"
+        "socket-name": "/tmp/kea-ddns-ctrl-socket"
     },
 
 //
index adced7f062e69aa2e91c4d497f63150066f65ef5..601e5cf62592261070412c92231ff66d21ca26d0 100644 (file)
@@ -25,7 +25,7 @@
 //    "control-socket":
 //    {
 //        "socket-type": "unix",
-//        "socket-name": "/tmp/d2-ctrl-socket"
+//        "socket-name": "/tmp/kea-ddns-ctrl-socket"
 //    },
 
 //
index 6792d42d7023eb342809db7e498854fd270032ab..5cc9bff32d131542ed11f9e9e0197adfa66a4ad8 100644 (file)
@@ -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.
index 8ead75e0372c30afdcac0af02d93a37192d1565a..40609f125a02086b9c46f576f0c987d1f07d1eaa 100644 (file)
@@ -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.
index ce02a9c151a91ade470c54131761ca184436d8f3..e9f43fd7defb3def31bf5a035111bef794c7b4a2 100644 (file)
@@ -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.
index caafd91ff7622505ef548f0b380b87e3b1a90176..3e92951050a483c23cb040f16d3b1fd9e937b82f 100644 (file)
@@ -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.
index 2e3b54583c5edf3d2ad97a7fd0247fb05c36711e..4b4230de85fb93e7002027a81dfcaea4e1dea8a5 100644 (file)
@@ -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.
index 767e4c0481aac3ede40b26435649c09471ac9781..c823b3d217533502e6cfc7a1a485f4772a4035a0 100644 (file)
@@ -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.
index 9e19284660d21d3d86186d375dec8e80c7a396b2..1190e9b0b386c051a72df7bc0e2f504a660b213f 100644 (file)
@@ -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.
index 57705d4eb6ad53034b06ef9d9fed43a7eef921e9..f59a57349938e5cb4f72db0c4d9a64c15660818d 100644 (file)
@@ -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.
index 7f04e8d3acda5b10d3fbf8169bc9670ad4928075..99014e78503847212d2e40fa3c4b4dba41d98351 100644 (file)
@@ -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"
                 }
             }
         },
index acf9342d977f7b18fb4c3a0d8960367a98510d14..5da5cfa5d1af349b2fb84d399f17a4cbf697525e 100644 (file)
@@ -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>
index 80b5c132033b8ee2939c2f280575eae3c35c2885..c17390243e29123f3073d46ee28762abdedc2e6d 100644 (file)
@@ -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>
index a0924cff8d96cbe306f8ae7c9b7a926dcc218f2f..128693173cb2c0a5c7fe796ecc164a409d942f1f 100644 (file)
@@ -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>
index 3b55789d290ce1345bd5f6e13e7c6709e163183c..18d1da8901b8fc1729ed761330126a033dc7e4d2 100644 (file)
@@ -2,7 +2,7 @@
     "Dhcp6": {
         "control-socket": {
             "socket-type": "unix",
-            "socket-name": "/tmp/kea6-sock"
+            "socket-name": "/tmp/kea6-ctrl-socket"
         }
     }
 }
index 16024c62e7d39616b60f27609d757983c80d22e1..7ce04e468219d7ca51abe6d8a45a2f24097fca4a 100644 (file)
@@ -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>
index 8c918065dba8fb63b9fd68fd6aa01a63cb39f3a5..1a8cd2113a11ad29cd53f214415e864fa24e0119 100644 (file)
@@ -8,7 +8,7 @@
                 "control-socket":
                 {
                     "socket-type": "unix",
-                    "socket-name": "/tmp/kea6-sock"
+                    "socket-name": "/tmp/kea6-ctrl-socket"
                 }
             }
         },
index c59934ba1f61e139139869bde79892d8a9cafbe4..b085833b14f9fcd38abce825156e981f26fec3ab 100644 (file)
@@ -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>
index 719dbc79edfe65eb4385f5e5e4e822cf9077bbdd..8fb32c9d940c6bd96a415a756fb3d53f954576f7 100644 (file)
@@ -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>
index 1a7610017fff61d187324ab3120d745ecdbf5c92..ba68a060ad10e01aa04b614c82fc63fc879db799 100644 (file)
@@ -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>
index 1c866feff7eb60035dc87598236f52d70d656a01..47b3dcb6dac3824d2c736975abb85219beca5c1f 100644 (file)
     "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"
         }
     },
 
index c1102cacaa065b31d00b3a9688949e4d404b6c5d..62f4a0f246301355c56754d3e0f677c00db4164f 100644 (file)
@@ -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" : {},
index 6f87293b869e0334c0cfe5b284b6f6a7f573feb3..5f77a32662ad76ec323ea22d4bbd637c65f67ea3 100644 (file)
@@ -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.
index 2e4d8ffe44cdb87773e955d2d715dd654805c527..ffa75fc5a9e1ef12fe516d91e0d407fcffed20fe 100644 (file)
@@ -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.
index f12717c8cb2ac570bd2ace135a92cfc5a6f2e8b6..6eeacecd86cb53988161b95034f9124d2dfff6ec 100644 (file)
         "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"
             }
         }
     },