[3427] Examples updated.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 548c4c340c38934c7a561891ef1bbc5851ae2252..450fe19df525a65da89f2b2075febb7e065ca72d 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,6 +4,7 @@ EXTRA_DIST = version.ent.in differences.txt Doxyfile Doxyfile-xml
 
 nobase_dist_doc_DATA  = examples/kea4/single-subnet.json
 nobase_dist_doc_DATA += examples/kea4/several-subnets.json
+nobase_dist_doc_DATA += examples/kea6/simple.json
 nobase_dist_doc_DATA += examples/kea6/several-subnets.json
 
 devel:

diff --git a/doc/examples/kea4/several-subnets.json b/doc/examples/kea4/several-subnets.json
index a3b04b271e5b7f10e7bdd9284906d17cc4051a40..ce88d84bc483d6484cea7a3bbaf58e4a39f5c595 100644 (file)
--- a/doc/examples/kea4/several-subnets.json
+++ b/doc/examples/kea4/several-subnets.json
@@ -4,7 +4,7 @@
 
 { "Dhcp4":
 
-{ 
+{
 # Kea is told to listen on eth0 interface only.
   "interfaces": [ "eth0" ],
 
@@ -26,13 +26,30 @@
 
 # The following list defines subnets. Each subnet consists of at
 # least subnet and pool entries.
-  "subnet4": [ 
+  "subnet4": [
   {    "pool": [ "192.0.2.1 - 192.0.2.200" ],
        "subnet": "192.0.2.0/24"  },
   {    "pool": [ "192.0.3.100 - 192.0.3.200" ],
        "subnet": "192.0.3.0/24"  },
   {    "pool": [ "192.0.4.1 - 192.0.4.254" ],
        "subnet": "192.0.4.0/24"  } ]
+},
+
+# The following configures logging. Kea will log all debug messages
+# to /var/log/kea-debug.log file.
+"Logging": {
+    "loggers": [
+        {
+            "name": "kea",
+            "output_options": [
+                {
+                    "output": "/var/log/kea-debug.log"
+                }
+            ],
+            "debuglevel": 99,
+            "severity": "DEBUG"
+        }
+    ]
 }
 
 }

diff --git a/doc/examples/kea4/single-subnet.json b/doc/examples/kea4/single-subnet.json
index dc7d23f243ecbdf31848c8ad55e360f7a9e20330..c7a2d6705df0e0d36ba25a2cf23b75157fc64f88 100644 (file)
--- a/doc/examples/kea4/single-subnet.json
+++ b/doc/examples/kea4/single-subnet.json
@@ -4,7 +4,7 @@
 
 { "Dhcp4":
 
-{ 
+{
 # Kea is told to listen on eth0 interface only.
   "interfaces": [ "eth0" ],
 
@@ -30,10 +30,27 @@
 #  "rebind-timer": 2000,
 
 # The following list defines subnets. We have only one subnet
-# here.
-  "subnet4": [ 
+# here. We tell Kea that it is directly available over local interface.
+  "subnet4": [
   {    "pool": [ "192.0.2.1 - 192.0.2.200" ],
-       "subnet": "192.0.2.0/24"  } ]
+       "subnet": "192.0.2.0/24",
+       "interface": "eth0"  } ]
+},
+
+# The following configures logging. It assumes that messages with at least
+# informational level (info, warn, error) will will be logged to stdout.
+"Logging": {
+    "loggers": [
+        {
+            "name": "kea",
+            "output_options": [
+                {
+                    "output": "stdout"
+                }
+            ],
+            "severity": "INFO"
+        }
+    ]
 }
 
 }

diff --git a/doc/examples/kea6/several-subnets.json b/doc/examples/kea6/several-subnets.json
index 0b2bdb41f31acbe7dff891c9428f15f2d7d3ce62..38528f32c8ce15ca4d4c2c6d9a54acf3b0e414cb 100644 (file)
--- a/doc/examples/kea6/several-subnets.json
+++ b/doc/examples/kea6/several-subnets.json
@@ -4,7 +4,7 @@
 
 { "Dhcp6":
 
-{ 
+{
 # Kea is told to listen on eth0 interface only.
   "interfaces": [ "eth0" ],
 
@@ -28,16 +28,31 @@
 
 # The following list defines subnets. Each subnet consists of at
 # least subnet and pool entries.
-  "subnet6": [ 
+  "subnet6": [
   {    "pool": [ "2001:db8:1::/80" ],
        "subnet": "2001:db8:1::/64"  },
   {    "pool": [ "2001:db8:2::/80" ],
-       "subnet": "2001:db8:2::/64"  }, 
+       "subnet": "2001:db8:2::/64"  },
   {    "pool": [ "2001:db8:3::/80" ],
        "subnet": "2001:db8:3::/64"  },
   {    "pool": [ "2001:db8:4::/80" ],
        "subnet": "2001:db8:4::/64"  } ]
-}
+},
 
+# The following configures logging. It assumes that warning messages
+# will be logged to stdout.
+"Logging": {
+    "loggers": [
+        {
+            "name": "kea",
+            "output_options": [
+                {
+                    "output": "stdout"
+                }
+            ],
+            "severity": "WARN"
+        }
+    ]
 }
 
+}

diff --git a/doc/examples/kea6/simple.json b/doc/examples/kea6/simple.json
new file mode 100644 (file)
index 0000000..6587281
--- /dev/null
+++ b/doc/examples/kea6/simple.json
@@ -0,0 +1,59 @@
+# This is an example configuration file for DHCPv6 server in Kea.
+# It's a basic scenario with four IPv6 subnets configured. It is
+# assumed that one subnet (2001:db8:1::/64 is available directly
+# over eth0 interface.
+
+{ "Dhcp6":
+
+{ 
+# Kea is told to listen on eth0 interface only.
+  "interfaces": [ "eth0" ],
+
+# We need to specify lease type. As of May 2014, three backends are supported:
+# memfile, mysql and pgsql. We'll just use memfile, because it doesn't require
+# any prior set up.
+  "lease-database": {
+    "type": "memfile"
+  },
+
+# Addresses will be assigned with preferred and valid lifetimes
+# being 3000 and 4000, respectively. Client is told to start
+# renewing after 1000 seconds. If the server does not repond
+# after 2000 seconds since the lease was granted, client is supposed
+# to start REBIND procedure (emergency renewal that allows switching
+# to a different server).
+  "preferred-lifetime": 3000,
+  "valid-lifetime": 4000,
+  "renew-timer": 1000,
+  "rebind-timer": 2000,
+
+# The following list defines subnets. Each subnet consists of at
+# least subnet and pool entries.
+  "subnet6": [ 
+    {
+      "pool": [ "2001:db8:1::/80" ],
+      "subnet": "2001:db8:1::/64",
+      "interface": "eth0"
+    }
+  ]
+},
+
+# The following configures logging. Kea will log all debug messages
+# to /var/log/kea-debug.log file.
+"Logging": {
+    "loggers": [
+        {
+            "name": "kea",
+            "output_options": [
+                {
+                    "output": "/var/log/kea-debug.log"
+                }
+            ], 
+            "debuglevel": 99,
+            "severity": "DEBUG"
+        }
+    ]
+}
+
+}
+

diff --git a/doc/guide/logging.xml b/doc/guide/logging.xml
index c1ee94faf2f741766ed1a0e78b2a3e633141a24c..2459896029fb39d12a25ce2f059295516e2b3faf 100644 (file)
--- a/doc/guide/logging.xml
+++ b/doc/guide/logging.xml
@@ -387,7 +387,7 @@ TODO; there's a ticket to determine these levels, see #1074
 "Logging": {
     "loggers": [
         {
-            "name": "*",
+            "name": "kea",
             "output_options": [
                 {
                     "output": "stdout"