From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 26 Jun 2014 16:47:21 +0000 (+0200)
Subject: [3418] Changes after review
X-Git-Tag: trac3473_base~12^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faa5db1e595f67f91ac9d3c345b799d2be565bae;p=thirdparty%2Fkea.git

[3418] Changes after review

 - example config files are now installed
 - example in section 5.2 configures persistent database
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0fb1ed5d07..548c4c340c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,6 +2,10 @@ SUBDIRS = guide design
 
 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/several-subnets.json
+
 devel:
 	mkdir -p html
 	(cat Doxyfile; echo PROJECT_NUMBER=$(PACKAGE_VERSION)) | doxygen - > html/doxygen.log 2> html/doxygen-error.log
diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml
index dffdf02930..681e218f84 100644
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@ -81,7 +81,9 @@
 
 # Next we specify the type of lease database
     "lease-database": {
-        "type": "memfile"
+        "type": "memfile",
+        "persist": true,
+        "name": "/var/kea/dhcp4.leases"
     },
 
 # Finally, we list the subnets from which we will be leasing addresses.