[5108] Removed kea-ca.conf.

diff --git a/src/bin/keactrl/.gitignore b/src/bin/keactrl/.gitignore
index 2f0c7ac5a60257a42ed36283af6e9f4a85a542c7..08a7388bda4380bb94e83656787af4d44ab9f3fe 100644 (file)
--- a/src/bin/keactrl/.gitignore
+++ b/src/bin/keactrl/.gitignore
@@ -1,5 +1,4 @@
 /keactrl
 /kea.conf
-/kea-ca.conf
 /keactrl.conf
 /keactrl.8

diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am
index ac2c894ee9a0725a4e084eadda8664f431c5d91e..c83a59745700531d90bda0f88eb491483c04a45d 100644 (file)
--- a/src/bin/keactrl/Makefile.am
+++ b/src/bin/keactrl/Makefile.am
@@ -5,16 +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
-CONFIGFILES = keactrl.conf kea.conf kea-ca.conf
+CONFIGFILES = keactrl.conf kea.conf
 
 man_MANS = keactrl.8
 DISTCLEANFILES = keactrl keactrl.conf $(man_MANS)
-CLEANFILES = kea.conf kea-ca.conf
-EXTRA_DIST = keactrl.in keactrl.conf.in kea.conf.pre kea-ca.conf.pre $(man_MANS) keactrl.xml
+CLEANFILES = kea.conf
+EXTRA_DIST = keactrl.in keactrl.conf.in kea.conf.pre $(man_MANS) keactrl.xml
 
-# kea.conf and kea-ca.conf are not really sources used for building other targets, but we need
-# these files to be generated before make install is called.
-BUILT_SOURCES = kea.conf kea-ca.conf
+# kea.conf is not really a source used for building other targets, but we need
+# this file to be generated before make install is called.
+BUILT_SOURCES = kea.conf
 
 if GENERATE_DOCS
 
@@ -32,10 +32,6 @@ endif
 kea.conf: kea.conf.pre
        $(top_builddir)/tools/path_replacer.sh $(top_srcdir)/src/bin/keactrl/kea.conf.pre $@
 
-kea-ca.conf: kea-ca.conf.pre
-       $(top_builddir)/tools/path_replacer.sh $(top_srcdir)/src/bin/keactrl/kea-ca.conf.pre $@
-
-
 if INSTALL_CONFIGURATIONS
 
 install-data-local:

diff --git a/src/bin/keactrl/kea-ca.conf.pre b/src/bin/keactrl/kea-ca.conf.pre
deleted file mode 100644 (file)
index b788896..0000000
--- a/src/bin/keactrl/kea-ca.conf.pre
+++ /dev/null
@@ -1,44 +0,0 @@
-// This is a basic configuraton 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"
-//          }
-//      }
-        ]
-    },
-
-    // Basic logging configuration for the Control Agent.
-    "Logging": {
-        "loggers": [ {
-            "name": "kea-ctrl-agent",
-            "severity": "INFO"
-        } ]
-    }
-}