From: Razvan Becheriu Date: Thu, 31 Mar 2022 04:55:20 +0000 (+0300) Subject: [#2116] addressed review X-Git-Tag: Kea-2.1.5~108 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7eb6ad54e4d619e036787f0f2aed8cef2b853282;p=thirdparty%2Fkea.git [#2116] addressed review --- diff --git a/configure.ac b/configure.ac index b0c8389a9e..ba898dd2d8 100644 --- a/configure.ac +++ b/configure.ac @@ -831,7 +831,7 @@ AC_ARG_WITH([cql], [cql_config="$withval"]) if test "${cql_config}" != "no" ; then - AC_MSG_ERROR([$CQL_CONFIG CAssandra is no longer supported]) + AC_MSG_ERROR([$CQL_CONFIG Cassandra is no longer supported]) fi # Check for sysrepo. diff --git a/doc/examples/kea4/all-keys-netconf.json b/doc/examples/kea4/all-keys-netconf.json index 6b4a7fad02..cb69a53039 100644 --- a/doc/examples/kea4/all-keys-netconf.json +++ b/doc/examples/kea4/all-keys-netconf.json @@ -334,19 +334,6 @@ // Type of the database, e.g. "mysql", "postgresql". "type": "postgresql", - // User name to be used to access the database. - "user": "kea" - }, - { - // Database password. - "password": "kea", - - // Port on which the database is available. - "port": 9042, - - // Type of the database, e.g. "mysql", "postgresql". - "type": "mysql", - // User name to be used to access the database. "user": "kea", @@ -456,7 +443,7 @@ // because non stored leases will be lost upon Kea server restart. "persist": true, - // Lease database backend type, i.e. "memfile", "mysql", or + // Lease database backend type, i.e. "memfile", "mysql" or // "postgresql". "type": "memfile" }, diff --git a/doc/examples/kea6/all-keys-netconf.json b/doc/examples/kea6/all-keys-netconf.json index 4eb5d55e20..a2098225ef 100644 --- a/doc/examples/kea6/all-keys-netconf.json +++ b/doc/examples/kea6/all-keys-netconf.json @@ -294,19 +294,6 @@ // Type of the database, e.g. "mysql", "postgresql". "type": "postgresql", - // User name to be used to access the database. - "user": "kea" - }, - { - // Database password. - "password": "kea", - - // Port on which the database is available. - "port": 9042, - - // Type of the database, e.g. "mysql", "postgresql". - "type": "mysql", - // User name to be used to access the database. "user": "kea", @@ -400,7 +387,7 @@ // because non stored leases will be lost upon Kea server restart. "persist": true, - // Lease database backend type, i.e. "memfile", "mysql", or + // Lease database backend type, i.e. "memfile", "mysql" or // "postgresql". "type": "memfile" }, diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst index 8501d17706..38b1465b1f 100644 --- a/doc/sphinx/arm/dhcp4-srv.rst +++ b/doc/sphinx/arm/dhcp4-srv.rst @@ -425,7 +425,7 @@ Lease Database Configuration Lease database configuration is controlled through the ``Dhcp4``/``lease-database`` parameters. The database type must be set to -``memfile``, ``mysql``, or ``postgresql``, e.g.: +``memfile``, ``mysql`` or ``postgresql``, e.g.: :: diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst index ab9891f301..fa250596a2 100644 --- a/doc/sphinx/arm/dhcp6-srv.rst +++ b/doc/sphinx/arm/dhcp6-srv.rst @@ -382,7 +382,7 @@ Lease Database Configuration Lease database configuration is controlled through the ``Dhcp6``/``lease-database`` parameters. The database type must be set to -``memfile``, ``mysql``, or ``postgresql``, e.g.: +``memfile``, ``mysql`` or ``postgresql``, e.g.: :: diff --git a/doc/sphinx/arm/hooks.rst b/doc/sphinx/arm/hooks.rst index 8c99bdfd39..913825cc52 100644 --- a/doc/sphinx/arm/hooks.rst +++ b/doc/sphinx/arm/hooks.rst @@ -1537,7 +1537,7 @@ table is part of the Kea database schemas. Configuration parameters are extended by standard lease database parameters as defined in :ref:`database-configuration4`. The ``type`` -parameter should be ``mysql``, ``postgresql``, or ``logfile``; when +parameter should be ``mysql``, ``postgresql`` or ``logfile``; when it is absent or set to ``logfile``, files are used. This database feature is experimental. No specific tools are provided diff --git a/doc/sphinx/arm/security.rst b/doc/sphinx/arm/security.rst index 6bb03f596b..ec7baa6db6 100644 --- a/doc/sphinx/arm/security.rst +++ b/doc/sphinx/arm/security.rst @@ -199,10 +199,9 @@ Limiting user permission to read or write the Kea configuration file is an impor Securing Database Connections ----------------------------- -Kea can use an external MySQL or PostgreSQL database to store configuration, -host reservations, or leases, or for forensic logging. The use of databases is a -popular feature, but it is optional; it is also possible to store data in a flat -file on disk. +Kea can use an external MySQL or PostgreSQL database to store configuration, host reservations, +or/and leases, or/and for forensic logging. The use of databases is a popular feature, but it is optional; +it is also possible to store data in a flat file on disk. When using a database, Kea stores and uses the following credentials to authenticate with the database: username, password, host, port, and database name. **These are stored in clear text diff --git a/src/lib/yang/tests/config_unittests.cc b/src/lib/yang/tests/config_unittests.cc index fae646b8b5..41f024737b 100644 --- a/src/lib/yang/tests/config_unittests.cc +++ b/src/lib/yang/tests/config_unittests.cc @@ -325,7 +325,7 @@ TEST_F(ConfigTestIetfV6, validateIetf6) { TEST_F(ConfigTestKeaV4, examples4) { vector examples = { "advanced.json", - //"all-keys-netconf.json", + "all-keys-netconf.json", "all-options.json", "backends.json", "classify.json", @@ -365,7 +365,7 @@ TEST_F(ConfigTestKeaV4, examples4) { TEST_F(ConfigTestKeaV6, examples6) { vector examples = { "advanced.json", - //"all-keys-netconf.json", + "all-keys-netconf.json", "all-options.json", "backends.json", "classify.json",