[#3831] Removed /tmp example conf and .pre

Changes to be committed:
    modified:   kea4/dhcpv4-over-dhcpv6.json
    modified:   netconf/simple-dhcp4.json
    modified:   netconf/simple-dhcp6.json
    modified:   ../../src/bin/keactrl/kea-ctrl-agent.conf.pre
    modified:   ../../src/bin/keactrl/kea-dhcp-ddns.conf.pre
    modified:   ../../src/bin/keactrl/kea-dhcp4.conf.pre
    modified:   ../../src/bin/keactrl/kea-dhcp6.conf.pre
    modified:   ../../src/bin/keactrl/kea-netconf.conf.pre

diff --git a/doc/examples/kea4/dhcpv4-over-dhcpv6.json b/doc/examples/kea4/dhcpv4-over-dhcpv6.json
index 7909c72e6ec591fe916e158980f0127bcfb9928f..ff338470d8a582143d7d809dfee2a1a43cfc2876 100644 (file)
--- a/doc/examples/kea4/dhcpv4-over-dhcpv6.json
+++ b/doc/examples/kea4/dhcpv4-over-dhcpv6.json
@@ -36,7 +36,7 @@
       "name": "kea-dhcp4",
       "output-options": [
           {
-            "output": "/tmp/kea-dhcp4.log"
+            "output": "kea-dhcp4.log"
           }
       ],
       "severity": "DEBUG",

diff --git a/doc/examples/netconf/simple-dhcp4.json b/doc/examples/netconf/simple-dhcp4.json
index 725a002596bdc6469a5b21e267a97481b07988b2..6847e2a9f3e8ef3e19ddb6a8db03495375d7a5b9 100644 (file)
--- a/doc/examples/netconf/simple-dhcp4.json
+++ b/doc/examples/netconf/simple-dhcp4.json
@@ -57,7 +57,7 @@
                 "control-socket":
                 {
                     "socket-type": "unix",
-                    "socket-name": "/tmp/kea4-ctrl-socket"
+                    "socket-name": "kea4-ctrl-socket"
                 },
 
                 // Comment is optional. You can put some notes here.

diff --git a/doc/examples/netconf/simple-dhcp6.json b/doc/examples/netconf/simple-dhcp6.json
index dd9a67b5b12dd6271fa8a0dc2269e515f66d0e83..0b74926666e612529ab6a06dad7ee955e3bafbb2 100644 (file)
--- a/doc/examples/netconf/simple-dhcp6.json
+++ b/doc/examples/netconf/simple-dhcp6.json
@@ -58,7 +58,7 @@
                 "control-socket":
                 {
                     "socket-type": "unix",
-                    "socket-name": "/tmp/kea6-ctrl-socket"
+                    "socket-name": "kea6-ctrl-socket"
                 },
 
                 // Comment is optional. You can put some notes here.

diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre
index dda4a0485e571eadfd7ce4b36fc705dfe232ff7d..29d81111b097991fd83e1ebac69583d65977cd22 100644 (file)
--- a/src/bin/keactrl/kea-ctrl-agent.conf.pre
+++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre
@@ -66,15 +66,15 @@
     "control-sockets": {
         "dhcp4": {
             "socket-type": "unix",
-            "socket-name": "/tmp/kea4-ctrl-socket"
+            "socket-name": "kea4-ctrl-socket"
         },
         "dhcp6": {
             "socket-type": "unix",
-            "socket-name": "/tmp/kea6-ctrl-socket"
+            "socket-name": "kea6-ctrl-socket"
         },
         "d2": {
             "socket-type": "unix",
-            "socket-name": "/tmp/kea-ddns-ctrl-socket"
+            "socket-name": "kea-ddns-ctrl-socket"
         }
     },
 

diff --git a/src/bin/keactrl/kea-dhcp-ddns.conf.pre b/src/bin/keactrl/kea-dhcp-ddns.conf.pre
index 0d7f11536e364061a665a324c513dd8cc69a2f62..867f01802901787343895dd557d1879524eacddb 100644 (file)
--- a/src/bin/keactrl/kea-dhcp-ddns.conf.pre
+++ b/src/bin/keactrl/kea-dhcp-ddns.conf.pre
@@ -23,7 +23,7 @@
   "port": 53001,
   "control-socket": {
       "socket-type": "unix",
-      "socket-name": "/tmp/kea-ddns-ctrl-socket"
+      "socket-name": "kea-ddns-ctrl-socket"
   },
   "tsig-keys": [],
   "forward-ddns" : {},

diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre
index 4fef00add789028b73eaff070e35b038e55171d4..5f9929ac0ee56a61039d02c1a84604ecd20af54e 100644 (file)
--- a/src/bin/keactrl/kea-dhcp4.conf.pre
+++ b/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/kea4-ctrl-socket"
+        "socket-name": "kea4-ctrl-socket"
     },
 
     // Use Memfile lease database backend to store leases in a CSV file.

diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre
index 120cead932c49a237123f544a93fac11bed4ad71..d6fe6c3e8cc3f7f48025be10f9271949b5e12213 100644 (file)
--- a/src/bin/keactrl/kea-dhcp6.conf.pre
+++ b/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/kea6-ctrl-socket"
+        "socket-name": "kea6-ctrl-socket"
     },
 
     // Use Memfile lease database backend to store leases in a CSV file.

diff --git a/src/bin/keactrl/kea-netconf.conf.pre b/src/bin/keactrl/kea-netconf.conf.pre
index bc7b3926f4203891d1eacde4d4d50d4e0bd211be..b559604ecd821e1672ac2921d319238829bd93aa 100644 (file)
--- a/src/bin/keactrl/kea-netconf.conf.pre
+++ b/src/bin/keactrl/kea-netconf.conf.pre
@@ -30,13 +30,13 @@
         "dhcp4": {
             "control-socket": {
                 "socket-type": "unix",
-                "socket-name": "/tmp/kea4-ctrl-socket"
+                "socket-name": "kea4-ctrl-socket"
             }
         },
         "dhcp6": {
             "control-socket": {
                 "socket-type": "unix",
-                "socket-name": "/tmp/kea6-ctrl-socket"
+                "socket-name": "kea6-ctrl-socket"
             }
         }
     },