From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 4 Oct 2017 13:22:55 +0000 (+0200)
Subject: [5338] Addressed review comments.
X-Git-Tag: trac5361_base^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c489549854b5ae06078607dd38a3f527abe6dce8;p=thirdparty%2Fkea.git

[5338] Addressed review comments.

Wrapped long lines in Makefile.am and updated default configs with a note
that configurations of other daemons are ignored.
---

diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am
index 51b19af215..6754691df8 100644
--- a/src/bin/keactrl/Makefile.am
+++ b/src/bin/keactrl/Makefile.am
@@ -5,14 +5,16 @@ SUBDIRS = . tests
 # If the default location needs to be changed it may be achieved by
 # setting KEACTRL_CONF environment variable.
 sbin_SCRIPTS  = keactrl
-KEA_CONFIGFILES = kea-dhcp4.conf kea-dhcp6.conf kea-dhcp-ddns.conf kea-ctrl-agent.conf
+KEA_CONFIGFILES = kea-dhcp4.conf kea-dhcp6.conf kea-dhcp-ddns.conf \
+                  kea-ctrl-agent.conf
 CONFIGFILES = keactrl.conf $(KEA_CONFIGFILES)
 
 man_MANS = keactrl.8
 DISTCLEANFILES = keactrl keactrl.conf $(man_MANS)
 CLEANFILES = $(KEA_CONFIGFILES)
-EXTRA_DIST = keactrl.in keactrl.conf.in kea-dhcp4.conf.pre kea-dhcp6.conf.pre \
-	kea-dhcp-ddns.conf.pre kea-ctrl-agent.conf.pre $(man_MANS) keactrl.xml
+EXTRA_DIST = keactrl.in keactrl.conf.in kea-dhcp4.conf.pre \
+             kea-dhcp6.conf.pre kea-dhcp-ddns.conf.pre \
+             kea-ctrl-agent.conf.pre $(man_MANS) keactrl.xml
 
 # *.conf files are not really sources used for building other targets, but we need
 # these files to be generated before make install is called.
@@ -21,7 +23,8 @@ BUILT_SOURCES = $(KEA_CONFIGFILES)
 if GENERATE_DOCS
 
 keactrl.8: keactrl.xml
-	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/keactrl.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
+        http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/keactrl.xml
 
 else
 
@@ -32,16 +35,20 @@ $(man_MANS):
 endif
 
 kea-dhcp4.conf: kea-dhcp4.conf.pre
-	$(top_builddir)/tools/path_replacer.sh $(top_srcdir)/src/bin/keactrl/kea-dhcp4.conf.pre $@
+	$(top_builddir)/tools/path_replacer.sh \
+    $(top_srcdir)/src/bin/keactrl/kea-dhcp4.conf.pre $@
 
 kea-dhcp6.conf: kea-dhcp6.conf.pre
-	$(top_builddir)/tools/path_replacer.sh $(top_srcdir)/src/bin/keactrl/kea-dhcp6.conf.pre $@
+	$(top_builddir)/tools/path_replacer.sh \
+    $(top_srcdir)/src/bin/keactrl/kea-dhcp6.conf.pre $@
 
 kea-dhcp-ddns.conf: kea-dhcp-ddns.conf.pre
-	$(top_builddir)/tools/path_replacer.sh $(top_srcdir)/src/bin/keactrl/kea-dhcp-ddns.conf.pre $@
+	$(top_builddir)/tools/path_replacer.sh \
+    $(top_srcdir)/src/bin/keactrl/kea-dhcp-ddns.conf.pre $@
 
 kea-ctrl-agent.conf: kea-ctrl-agent.conf.pre
-	$(top_builddir)/tools/path_replacer.sh $(top_srcdir)/src/bin/keactrl/kea-ctrl-agent.conf.pre $@
+	$(top_builddir)/tools/path_replacer.sh \
+    $(top_srcdir)/src/bin/keactrl/kea-ctrl-agent.conf.pre $@
 
 if INSTALL_CONFIGURATIONS
 
diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre
index 83e6efe215..4725d1dae1 100644
--- a/src/bin/keactrl/kea-ctrl-agent.conf.pre
+++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre
@@ -8,6 +8,10 @@
 // your software should come with your Kea package, but it is also available
 // on Kea web page (http://kea.isc.org, click User's Guide, direct link for
 // stable version is http://kea.isc.org/docs/kea-guide.html).
+//
+// This configuration file contains only Control Agent's configuration.
+// If configurations for other Kea services are also included in this file they
+// are ignored by the Control Agent.
 {
 
 // This is a basic configuration for the Kea Control Agent.
diff --git a/src/bin/keactrl/kea-dhcp-ddns.conf.pre b/src/bin/keactrl/kea-dhcp-ddns.conf.pre
index 3bd9290d4f..486516cb50 100644
--- a/src/bin/keactrl/kea-dhcp-ddns.conf.pre
+++ b/src/bin/keactrl/kea-dhcp-ddns.conf.pre
@@ -8,6 +8,10 @@
 // your software should come with your Kea package, but it is also available
 // on Kea web page (http://kea.isc.org, click User's Guide, direct link for
 // stable version is http://kea.isc.org/docs/kea-guide.html).
+//
+// This configuration file contains only DHCP DDNS daemon's configuration.
+// If configurations for other Kea services are also included in this file they
+// are ignored by the DHCP DDNS daemon.
 {
 
 // DHCP DDNS configuration starts here. This is a very simple configuration
@@ -22,41 +26,6 @@
   "reverse-ddns" : {}
 },
 
-// This is a basic configuration for the Kea Control Agent.
-// RESTful interface to be available at http://127.0.0.1:8080/
-"Control-agent": {
-    "http-host": "127.0.0.1",
-    "http-port": 8080,
-
-    // Specify location of the files to which the Control Agent
-    // should connect to forward commands to the DHCPv4 and DHCPv6
-    // server via unix domain socket.
-    "control-sockets": {
-        "dhcp4": {
-            "socket-type": "unix",
-            "socket-name": "/tmp/kea-dhcp4-ctrl.sock"
-        },
-        "dhcp6": {
-            "socket-type": "unix",
-            "socket-name": "/tmp/kea-dhcp6-ctrl.sock"
-        }
-    },
-
-    // Specify hooks libraries that are attached to the Control Agent.
-    // Such hooks libraries should support 'control_command_receive'
-    // hook point. This is currently commented out because it has to
-    // point to the existing hooks library. Otherwise the Control
-    // Agent will fail to start.
-    "hooks-libraries": [
-//  {
-//      "library": "/opt/local/control-agent-commands.so",
-//      "parameters": {
-//          "param1": "foo"
-//      }
-//  }
-    ]
-},
-
 // Logging configuration starts here. Kea uses different loggers to log various
 // activities. For details (e.g. names of loggers), see Chapter 18.
 "Logging":
diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre
index 2e6b5815c3..191c37d669 100644
--- a/src/bin/keactrl/kea-dhcp4.conf.pre
+++ b/src/bin/keactrl/kea-dhcp4.conf.pre
@@ -17,6 +17,10 @@
 // your software should come with your Kea package, but it is also available
 // on Kea web page (http://kea.isc.org, click User's Guide, direct link for
 // stable version is http://kea.isc.org/docs/kea-guide.html).
+//
+// This configuration file contains only DHCPv4 server's configuration.
+// If configurations for other Kea services are also included in this file they
+// are ignored by the DHCPv4 server.
 {
 
 // DHCPv4 configuration starts here. This section will be read by DHCPv4 server
diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre
index 51899729ce..3648bda68f 100644
--- a/src/bin/keactrl/kea-dhcp6.conf.pre
+++ b/src/bin/keactrl/kea-dhcp6.conf.pre
@@ -17,6 +17,10 @@
 // your software should come with your Kea package, but it is also available
 // on Kea web page (http://kea.isc.org, click User's Guide, direct link for
 // stable version is http://kea.isc.org/docs/kea-guide.html).
+//
+// This configuration file contains only DHCPv6 server's configuration.
+// If configurations for other Kea services are also included in this file they
+// are ignored by the DHCPv6 server.
 {
 
 // DHCPv6 configuration starts here. This section will be read by DHCPv6 server