commit: 105bd8959f968d89b5f5d6216756f4123602f608 Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> AuthorDate: Thu Aug 26 17:21:27 2021 +0000 Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> CommitDate: Wed Sep 8 04:48:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=105bd895
net-misc/kea: various improvements fixed-gtest detection added Systemd services Closes: https://bugs.gentoo.org/693332 Closes: https://bugs.gentoo.org/626280 Bug: https://bugs.gentoo.org/751883 Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> net-misc/kea/files/kea-1.8.2-gtest.patch | 149 ++++++++++ net-misc/kea/files/kea-1.9.10-gtest.patch | 143 ++++++++++ net-misc/kea/files/kea-ctrl-agent.conf | 99 +++++++ net-misc/kea/files/kea-ctrl-agent.service | 19 ++ net-misc/kea/files/kea-ddns-server.conf | 76 +++++ net-misc/kea/files/kea-ddns-server.service | 18 ++ net-misc/kea/files/kea-dhcp4-server.service | 18 ++ net-misc/kea/files/kea-dhcp4.conf | 401 ++++++++++++++++++++++++++ net-misc/kea/files/kea-dhcp6-server.service | 18 ++ net-misc/kea/files/kea-dhcp6.conf | 420 ++++++++++++++++++++++++++++ net-misc/kea/files/kea.tmpfiles.conf | 2 + net-misc/kea/kea-1.8.2-r1.ebuild | 112 ++++++++ net-misc/kea/kea-1.9.10-r1.ebuild | 111 ++++++++ net-misc/kea/kea-9999.ebuild | 53 +++- net-misc/kea/metadata.xml | 10 + 15 files changed, 1638 insertions(+), 11 deletions(-) diff --git a/net-misc/kea/files/kea-1.8.2-gtest.patch b/net-misc/kea/files/kea-1.8.2-gtest.patch new file mode 100644 index 00000000000..5fa4488b926 --- /dev/null +++ b/net-misc/kea/files/kea-1.8.2-gtest.patch @@ -0,0 +1,149 @@ +--- a/m4macros/ax_gtest.m4 ++++ b/m4macros/ax_gtest.m4 +@@ -1,24 +1,14 @@ + AC_DEFUN([AX_ISC_GTEST], [ + +-enable_gtest="no" +-GTEST_INCLUDES= +- +-AC_ARG_WITH([gtest-source], +- [AS_HELP_STRING([--with-gtest-source=PATH], +- [location of the Googletest source])], +- [enable_gtest="yes" ; GTEST_SOURCE="$withval"]) +- +-AC_ARG_WITH([gtest], +- [AS_HELP_STRING([--with-gtest=PATH], +- [specify a path to gtest header files (PATH/include) and library (PATH/lib)])], +- [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"]) ++AC_ARG_ENABLE([gtest], ++ [AS_HELP_STRING([--enable-gtest], ++ [Enable testing via Googletest [default=no]])]) + + AC_ARG_WITH([lcov], + [AS_HELP_STRING([--with-lcov=PROGRAM], + [enable gtest and coverage target using the specified lcov])], + [lcov="$withval"], + [lcov="no"]) +- + USE_LCOV="no" + if test "$lcov" != "no"; then + # force gtest if not set +@@ -55,110 +45,22 @@ + # + # Check availability of gtest, which will be used for unit tests. + # +-GTEST_LDFLAGS= +-GTEST_LDADD= + DISTCHECK_GTEST_CONFIGURE_FLAG= +-GTEST_VERSION="unknown" +- +-if test "x$enable_gtest" = "xyes" ; then +- +- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=$gtest_path" +- +- if test -n "$with_gtest_source" ; then + +- if test "x$GTEST_SOURCE" = "xyes" ; then ++AS_IF([test "x$enable_gtest" = "xyes"], [ ++ DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest" ++ PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])]) ++ GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest` ++ GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest` ++ GTEST_VERSION=`${PKG_CONFIG} --modversion gtest` ++]) + +- AC_MSG_CHECKING([for gtest source]) +- # If not specified, try some common paths. +- GTEST_SOURCE= +- for d in /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do +- if test -f $d/src/gtest-all.cc -a $d/src/gtest_main.cc; then +- GTEST_SOURCE=$d +- AC_MSG_RESULT([$GTEST_SOURCE]) +- break +- fi +- done +- if test -z $GTEST_SOURCE ; then +- AC_MSG_ERROR([no gtest source but it was selected]) +- fi +- else +- if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then +- GTEST_SOURCE=$GTEST_SOURCE/googletest +- fi +- if test -f $GTEST_SOURCE/src/gtest-all.cc -a $GTEST_SOURCE/src/gtest_main.cc; then +- have_gtest_source=yes +- else +- AC_MSG_ERROR([no gtest source at $GTEST_SOURCE]) +- fi +- fi +- have_gtest_source=yes +- +- GTEST_LDADD="\$(top_builddir)/ext/gtest/libgtest.a" +- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE" +- GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include" +- GTEST_VERSION="`basename $GTEST_SOURCE`" +- +-# Versions starting from 1.8.0 are put in the googletest directory. If the basename +-# returns googletest string, we need to cut it off and try baseline again. +- if test "$GTEST_VERSION" == "googletest"; then +- GTEST_VERSION=${GTEST_SOURCE%"/googletest"} +- GTEST_VERSION=`basename $GTEST_VERSION` +- fi +- GTEST_VERSION="${GTEST_VERSION#googletest-release-}" +- GTEST_VERSION="${GTEST_VERSION#gtest-}" +- fi +- +- if test "$gtest_path" != "no" ; then +- if test "$gtest_path" != "yes"; then +- GTEST_PATHS=$gtest_path +- if test -x "${gtest_path}/bin/gtest-config" ; then +- GTEST_CONFIG="${gtest_path}/bin/gtest-config" +- fi +- else +- AC_PATH_PROG([GTEST_CONFIG], [gtest-config]) +- fi +- if test -x "${GTEST_CONFIG}" ; then : +- # using cppflags instead of cxxflags +- GTEST_INCLUDES=`${GTEST_CONFIG} --cppflags` +- GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags` +- GTEST_LDADD=`${GTEST_CONFIG} --libs` +- GTEST_VERSION=`${GTEST_CONFIG} --version` +- GTEST_FOUND="true" +- else +- AC_MSG_WARN([Unable to locate Google Test gtest-config.]) +- if test -z "${GTEST_PATHS}" ; then +- GTEST_PATHS="/usr /usr/local" +- fi +- GTEST_FOUND="false" +- fi +- if test "${GTEST_FOUND}" != "true"; then +- GTEST_FOUND="false" +- for dir in $GTEST_PATHS; do +- if test -f "$dir/include/gtest/gtest.h"; then +- if ! test -f "$dir/lib/libgtest.a"; then +- AC_MSG_WARN([Found Google Test include but not the library in $dir.]) +- continue +- fi +- GTEST_INCLUDES="-I$dir/include" +- GTEST_LDFLAGS="-L$dir/lib" +- GTEST_LDADD="-lgtest" +- GTEST_FOUND="true" +- break +- fi +- done +- fi +- if test "${GTEST_FOUND}" != "true"; then +- AC_MSG_ERROR([Cannot find gtest in: $GTEST_PATHS]) +- fi +- +- fi +-fi + AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no") + AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes") + AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG) + AC_SUBST(GTEST_INCLUDES) + AC_SUBST(GTEST_LDFLAGS) +-AC_SUBST(GTEST_LDADD) ++AC_SUBST([GTEST_LDADD], [$GTEST_LIBS]) + AC_SUBST(GTEST_SOURCE) + + ])dnl AX_ISC_GTEST diff --git a/net-misc/kea/files/kea-1.9.10-gtest.patch b/net-misc/kea/files/kea-1.9.10-gtest.patch new file mode 100644 index 00000000000..f3e8cd7af4c --- /dev/null +++ b/net-misc/kea/files/kea-1.9.10-gtest.patch @@ -0,0 +1,143 @@ +--- a/m4macros/ax_gtest.m4 ++++ b/m4macros/ax_gtest.m4 +@@ -1,17 +1,8 @@ + AC_DEFUN([AX_ISC_GTEST], [ + +-enable_gtest="no" +-GTEST_INCLUDES= +- +-AC_ARG_WITH([gtest-source], +- [AS_HELP_STRING([--with-gtest-source=PATH], +- [location of the Googletest source])], +- [enable_gtest="yes" ; GTEST_SOURCE="$withval"]) +- +-AC_ARG_WITH([gtest], +- [AS_HELP_STRING([--with-gtest=PATH], +- [specify a path to gtest header files (PATH/include) and library (PATH/lib)])], +- [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"]) ++AC_ARG_ENABLE([gtest], ++ [AS_HELP_STRING([--enable-gtest], ++ [enable testing via Googletest [default=no]])]) + + AC_ARG_WITH([lcov], + [AS_HELP_STRING([--with-lcov=PROGRAM], +@@ -55,111 +46,22 @@ + # + # Check availability of gtest, which will be used for unit tests. + # +-GTEST_LDFLAGS= +-GTEST_LDADD= + DISTCHECK_GTEST_CONFIGURE_FLAG= +-GTEST_VERSION="unknown" +- +-if test "x$enable_gtest" = "xyes" ; then +- +- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=$gtest_path" +- +- if test -n "$with_gtest_source" ; then + +- if test "x$GTEST_SOURCE" = "xyes" ; then ++AS_IF([test "x$enable_gtest" = "xyes"], [ ++ DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest" ++ PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])]) ++ GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest` ++ GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest` ++ GTEST_VERSION=`${PKG_CONFIG} --modversion gtest` ++]) + +- AC_MSG_CHECKING([for gtest source]) +- # If not specified, try some common paths. +- GTEST_SOURCE= +- for d in /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do +- if test -f $d/src/gtest-all.cc -a $d/src/gtest_main.cc; then +- GTEST_SOURCE=$d +- AC_MSG_RESULT([$GTEST_SOURCE]) +- break +- fi +- done +- if test -z $GTEST_SOURCE ; then +- AC_MSG_ERROR([no gtest source but it was selected]) +- fi +- else +- if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then +- GTEST_SOURCE=$GTEST_SOURCE/googletest +- fi +- if test -f $GTEST_SOURCE/src/gtest-all.cc -a $GTEST_SOURCE/src/gtest_main.cc; then +- have_gtest_source=yes +- else +- AC_MSG_ERROR([no gtest source at $GTEST_SOURCE]) +- fi +- fi +- have_gtest_source=yes +- +- GTEST_LDADD="\$(top_builddir)/ext/gtest/libgtest.a" +- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE" +- GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include" +- GTEST_VERSION="`basename $GTEST_SOURCE`" +- +-# Versions starting from 1.8.0 are put in the googletest directory. If the basename +-# returns googletest string, we need to cut it off and try baseline again. +- if test "$GTEST_VERSION" = "googletest"; then +- GTEST_VERSION=${GTEST_SOURCE%"/googletest"} +- GTEST_VERSION=`basename $GTEST_VERSION` +- fi +- GTEST_VERSION="${GTEST_VERSION#googletest-release-}" +- GTEST_VERSION="${GTEST_VERSION#gtest-}" +- fi +- +- if test "$gtest_path" != "no" ; then +- if test "$gtest_path" != "yes"; then +- GTEST_PATHS=$gtest_path +- if test -x "${gtest_path}/bin/gtest-config" ; then +- GTEST_CONFIG="${gtest_path}/bin/gtest-config" +- fi +- else +- AC_PATH_PROG([GTEST_CONFIG], [gtest-config]) +- fi +- if test -x "${GTEST_CONFIG}" ; then : +- # using cppflags instead of cxxflags +- GTEST_INCLUDES=`${GTEST_CONFIG} --cppflags` +- GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags` +- GTEST_LDADD=`${GTEST_CONFIG} --libs` +- GTEST_VERSION=`${GTEST_CONFIG} --version` +- GTEST_FOUND="true" +- else +- AC_MSG_WARN([Unable to locate Google Test gtest-config.]) +- if test -z "${GTEST_PATHS}" ; then +- GTEST_PATHS="/usr /usr/local" +- fi +- GTEST_FOUND="false" +- fi +- if test "${GTEST_FOUND}" != "true"; then +- GTEST_FOUND="false" +- for dir in $GTEST_PATHS; do +- if test -f "$dir/include/gtest/gtest.h"; then +- if test -f "$dir/lib/libgtest.a" || \ +- test -f "$dir/lib/libgtest.so"; then +- GTEST_INCLUDES="-I$dir/include" +- GTEST_LDFLAGS="-L$dir/lib" +- GTEST_LDADD="-lgtest" +- GTEST_FOUND="true" +- break +- else +- AC_MSG_WARN([Found Google Test include but not the library in $dir.]) +- fi +- fi +- done +- fi +- if test "${GTEST_FOUND}" != "true"; then +- AC_MSG_ERROR([Cannot find gtest in: $GTEST_PATHS]) +- fi +- +- fi +-fi + AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no") + AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes") + AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG) + AC_SUBST(GTEST_INCLUDES) + AC_SUBST(GTEST_LDFLAGS) +-AC_SUBST(GTEST_LDADD) ++AC_SUBST([GTEST_LDADD], [$GTEST_LIBS]) + AC_SUBST(GTEST_SOURCE) + + ])dnl AX_ISC_GTEST diff --git a/net-misc/kea/files/kea-ctrl-agent.conf b/net-misc/kea/files/kea-ctrl-agent.conf new file mode 100644 index 00000000000..ab74123d21a --- /dev/null +++ b/net-misc/kea/files/kea-ctrl-agent.conf @@ -0,0 +1,99 @@ +// This is a basic configuration for the Kea Control Agent. +// +// This is just a very basic configuration. Kea comes with large suite (over 30) +// of configuration examples and extensive Kea User's Guide. Please refer to +// those materials to get better understanding of what this software is able to +// do. Comments in this configuration file sometimes refer to sections for more +// details. These are section numbers in Kea User's Guide. The version matching +// your software should come with your Kea package, but it is also available +// in ISC's Knowledgebase (https://kea.readthedocs.io; the direct link for +// the stable version is https://kea.readthedocs.io/). +// +// 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. +// RESTful interface to be available at http://127.0.0.1:8000/ +"Control-agent": { + "http-host": "127.0.0.1", + "http-port": 8000, + + // Specify location of the files to which the Control Agent + // should connect to forward commands to the DHCPv4, DHCPv6 + // and D2 servers via unix domain sockets. + "control-sockets": { + "dhcp4": { + "socket-type": "unix", + "socket-name": "/run/kea/kea4-ctrl-socket" + }, + "dhcp6": { + "socket-type": "unix", + "socket-name": "/run/kea/kea6-ctrl-socket" + }, + "d2": { + "socket-type": "unix", + "socket-name": "/run/kea/kea-ddns-ctrl-socket" + } + }, + + // 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": "@libdir@/kea/hooks/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. + "loggers": [ + { + // This specifies the logging for Control Agent daemon. + "name": "kea-ctrl-agent", + "output_options": [ + { + // Specifies the output file. There are several special values + // supported: + // - stdout (prints on standard output) + // - stderr (prints on standard error) + // - syslog (logs to syslog) + // - syslog:name (logs to syslog using specified name) + // Any other value is considered a name of the file + "output": "@localstatedir@/log/kea/kea-ctrl-agent.log" + + // Shorter log pattern suitable for use with systemd, + // avoids redundant information + // "pattern": "%-5p %m\n" + + // This governs whether the log output is flushed to disk after + // every write. + // "flush": false, + + // This specifies the maximum size of the file before it is + // rotated. + // "maxsize": 1048576, + + // This specifies the maximum number of rotated files to keep. + // "maxver": 8 + } + ], + // This specifies the severity of log messages to keep. Supported values + // are: FATAL, ERROR, WARN, INFO, DEBUG + "severity": "INFO", + + // If DEBUG level is specified, this value is used. 0 is least verbose, + // 99 is most verbose. Be cautious, Kea can generate lots and lots + // of logs if told to do so. + "debuglevel": 0 + } + ] +} +} diff --git a/net-misc/kea/files/kea-ctrl-agent.service b/net-misc/kea/files/kea-ctrl-agent.service new file mode 100644 index 00000000000..17569836520 --- /dev/null +++ b/net-misc/kea/files/kea-ctrl-agent.service @@ -0,0 +1,19 @@ +[Unit] +Description=Kea control agent process +Documentation=man:kea-ctrl-agent(8) +Wants=network-online.target +After=network-online.target time-sync.target + +[Service] +User=dhcp +Group=dhcp +RuntimeDirectory=kea +Environment="KEA_PIDFILE_DIR=/run/kea" +Environment="KEA_LOCKFILE_DIR=/run/lock/kea" +RuntimeDirectory=kea +ExecStart=/usr/sbin/kea-ctrl-agent -c /etc/kea/kea-ctrl-agent.conf +Restart=always + +[Install] +WantedBy=kea-dhcp4-server.service +WantedBy=kea-dhcp6-server.service diff --git a/net-misc/kea/files/kea-ddns-server.conf b/net-misc/kea/files/kea-ddns-server.conf new file mode 100644 index 00000000000..200a58bb361 --- /dev/null +++ b/net-misc/kea/files/kea-ddns-server.conf @@ -0,0 +1,76 @@ +// This is a basic configuration for the Kea DHCP DDNS daemon. +// +// This is just a very basic configuration. Kea comes with large suite (over 30) +// of configuration examples and extensive Kea User's Guide. Please refer to +// those materials to get better understanding of what this software is able to +// do. Comments in this configuration file sometimes refer to sections for more +// details. These are section numbers in Kea User's Guide. The version matching +// your software should come with your Kea package, but it is also available +// in ISC's Knowledgebase (https://kea.readthedocs.io; the direct link for +// the stable version is https://kea.readthedocs.io/). +// +// 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 +// that simply starts the DDNS daemon, but will not do anything useful. +// See Section 11 for examples and details description. +"DhcpDdns": +{ + "ip-address": "127.0.0.1", + "port": 53001, + "control-socket": { + "socket-type": "unix", + "socket-name": "/run/kea/kea-ddns-ctrl-socket" + }, + "tsig-keys": [], + "forward-ddns" : {}, + "reverse-ddns" : {}, + +// Logging configuration starts here. Kea uses different loggers to log various +// activities. For details (e.g. names of loggers), see Chapter 18. + "loggers": [ + { + // This specifies the logging for D2 (DHCP-DDNS) daemon. + "name": "kea-dhcp-ddns", + "output_options": [ + { + // Specifies the output file. There are several special values + // supported: + // - stdout (prints on standard output) + // - stderr (prints on standard error) + // - syslog (logs to syslog) + // - syslog:name (logs to syslog using specified name) + // Any other value is considered a name of the file + "output": "@localstatedir@/log/kea/kea-ddns.log" + + // Shorter log pattern suitable for use with systemd, + // avoids redundant information + // "pattern": "%-5p %m\n" + + // This governs whether the log output is flushed to disk after + // every write. + // "flush": false, + + // This specifies the maximum size of the file before it is + // rotated. + // "maxsize": 1048576, + + // This specifies the maximum number of rotated files to keep. + // "maxver": 8 + } + ], + // This specifies the severity of log messages to keep. Supported values + // are: FATAL, ERROR, WARN, INFO, DEBUG + "severity": "INFO", + + // If DEBUG level is specified, this value is used. 0 is least verbose, + // 99 is most verbose. Be cautious, Kea can generate lots and lots + // of logs if told to do so. + "debuglevel": 0 + } + ] +} +} diff --git a/net-misc/kea/files/kea-ddns-server.service b/net-misc/kea/files/kea-ddns-server.service new file mode 100644 index 00000000000..d239e8fc48e --- /dev/null +++ b/net-misc/kea/files/kea-ddns-server.service @@ -0,0 +1,18 @@ +[Unit] +Description=Kea DDNS service +Documentation=man:kea-dhcp-ddns(8) +Wants=network-online.target +After=network-online.target time-sync.target + +[Service] +User=dhcp +Group=dhcp +RuntimeDirectory=kea +Environment="KEA_PIDFILE_DIR=/run/kea" +Environment="KEA_LOCKFILE_DIR=/run/lock/kea" +ExecStart=/usr/sbin/kea-dhcp-ddns -c /etc/kea/kea-dhcp-ddns.conf +Restart=always + +[Install] +WantedBy=kea-dhcpv4-server.service +WantedBy=kea-dhcpv6-server.service diff --git a/net-misc/kea/files/kea-dhcp4-server.service b/net-misc/kea/files/kea-dhcp4-server.service new file mode 100644 index 00000000000..d37da7f3c6c --- /dev/null +++ b/net-misc/kea/files/kea-dhcp4-server.service @@ -0,0 +1,18 @@ +[Unit] +Description=ISC KEA DHCPv4 DHCP daemon +Documentation=man:kea-dhcp4(8) +Wants=network-online.target +Requires=kea-ctrl-agent.service +After=network-online.target mariadb.service mysql.service + +[Service] +User=dhcp +Group=dhcp +RuntimeDirectory=kea +Environment="KEA_PIDFILE_DIR=/run/kea" +Environment="KEA_LOCKFILE_DIR=/run/lock/kea" +ExecStart=/usr/sbin/kea-dhcp4 -c /etc/kea/kea-dhcp4.conf +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/kea/files/kea-dhcp4.conf b/net-misc/kea/files/kea-dhcp4.conf new file mode 100644 index 00000000000..e24121cb33d --- /dev/null +++ b/net-misc/kea/files/kea-dhcp4.conf @@ -0,0 +1,401 @@ +{ +// DHCPv4 configuration starts here. This section will be read by DHCPv4 server +// and will be ignored by other components. +"Dhcp4": { + // Add names of your network interfaces to listen on. + "interfaces-config": { + // See section 8.2.4 for more details. You probably want to add just + // interface name (e.g. "eth0" or specific IPv4 address on that + // interface name (e.g. "eth0/192.0.2.1"). + "interfaces": [ ] + + // Kea DHCPv4 server by default listens using raw sockets. This ensures + // all packets, including those sent by directly connected clients + // that don't have IPv4 address yet, are received. However, if your + // traffic is always relayed, it is often better to use regular + // UDP sockets. If you want to do that, uncomment this line: + // "dhcp-socket-type": "udp" + }, + + // Kea supports control channel, which is a way to receive management + // commands while the server is running. This is a Unix domain socket that + // receives commands formatted in JSON, e.g. config-set (which sets new + // configuration), config-reload (which tells Kea to reload its + // configuration from file), statistic-get (to retrieve statistics) and many + // more. For detailed description, see Sections 8.8, 16 and 15. + "control-socket": { + "socket-type": "unix", + "socket-name": "/run/kea/kea4-ctrl-socket" + }, + + // Use Memfile lease database backend to store leases in a CSV file. + // Depending on how Kea was compiled, it may also support SQL databases + // (MySQL and/or PostgreSQL) and even Cassandra. Those database backends + // require more parameters, like name, host and possibly user and password. + // There are dedicated examples for each backend. See Section 7.2.2 "Lease + // Storage" for details. + "lease-database": { + // Memfile is the simplest and easiest backend to use. It's an in-memory + // C++ database that stores its state in CSV file. + "type": "memfile", + "lfc-interval": 3600 + }, + + // Kea allows storing host reservations in a database. If your network is + // small or you have few reservations, it's probably easier to keep them + // in the configuration file. If your network is large, it's usually better + // to use database for it. To enable it, uncomment the following: + // "hosts-database": { + // "type": "mysql", + // "name": "kea", + // "user": "kea", + // "password": "kea", + // "host": "localhost", + // "port": 3306 + // }, + // See Section 7.2.3 "Hosts storage" for details. + + // Setup reclamation of the expired leases and leases affinity. + // Expired leases will be reclaimed every 10 seconds. Every 25 + // seconds reclaimed leases, which have expired more than 3600 + // seconds ago, will be removed. The limits for leases reclamation + // are 100 leases or 250 ms for a single cycle. A warning message + // will be logged if there are still expired leases in the + // database after 5 consecutive reclamation cycles. + "expired-leases-processing": { + "reclaim-timer-wait-time": 10, + "flush-reclaimed-timer-wait-time": 25, + "hold-reclaimed-time": 3600, + "max-reclaim-leases": 100, + "max-reclaim-time": 250, + "unwarned-reclaim-cycles": 5 + }, + + // Global timers specified here apply to all subnets, unless there are + // subnet specific values defined in particular subnets. + "renew-timer": 900, + "rebind-timer": 1800, + "valid-lifetime": 3600, + + // Many additional parameters can be specified here: + // - option definitions (if you want to define vendor options, your own + // custom options or perhaps handle standard options + // that Kea does not support out of the box yet) + // - client classes + // - hooks + // - ddns information (how the DHCPv4 component can reach a DDNS daemon) + // + // Some of them have examples below, but there are other parameters. + // Consult Kea User's Guide to find out about them. + + // These are global options. They are going to be sent when a client + // requests them, unless overwritten with values in more specific scopes. + // The scope hierarchy is: + // - global (most generic, can be overwritten by class, subnet or host) + // - class (can be overwritten by subnet or host) + // - subnet (can be overwritten by host) + // - host (most specific, overwrites any other scopes) + // + // Not all of those options make sense. Please configure only those that + // are actually useful in your network. + // + // For a complete list of options currently supported by Kea, see + // Section 7.2.8 "Standard DHCPv4 Options". Kea also supports + // vendor options (see Section 7.2.10) and allows users to define their + // own custom options (see Section 7.2.9). + "option-data": [ + // When specifying options, you typically need to specify + // one of (name or code) and data. The full option specification + // covers name, code, space, csv-format and data. + // space defaults to "dhcp4" which is usually correct, unless you + // use encapsulate options. csv-format defaults to "true", so + // this is also correct, unless you want to specify the whole + // option value as long hex string. For example, to specify + // domain-name-servers you could do this: + // { + // "name": "domain-name-servers", + // "code": 6, + // "csv-format": "true", + // "space": "dhcp4", + // "data": "192.0.2.1, 192.0.2.2" + // } + // but it's a lot of writing, so it's easier to do this instead: + { + "name": "domain-name-servers", + "data": "192.0.2.1, 192.0.2.2" + }, + + // Typically people prefer to refer to options by their names, so they + // don't need to remember the code names. However, some people like + // to use numerical values. For example, option "domain-name" uses + // option code 15, so you can reference to it either by + // "name": "domain-name" or "code": 15. + { + "code": 15, + "data": "example.org" + }, + + // Domain search is also a popular option. It tells the client to + // attempt to resolve names within those specified domains. For + // example, name "foo" would be attempted to be resolved as + // foo.mydomain.example.com and if it fails, then as foo.example.com + { + "name": "domain-search", + "data": "mydomain.example.com, example.com" + }, + + // String options that have a comma in their values need to have + // it escaped (i.e. each comma is preceded by two backslashes). + // That's because commas are reserved for separating fields in + // compound options. At the same time, we need to be conformant + // with JSON spec, that does not allow "\,". Therefore the + // slightly uncommon double backslashes notation is needed. + + // Legal JSON escapes are \ followed by "\/bfnrt character + // or \u followed by 4 hexadecimal numbers (currently Kea + // supports only \u0000 to \u00ff code points). + // CSV processing translates '\\' into '\' and '\,' into ',' + // only so for instance '\x' is translated into '\x'. But + // as it works on a JSON string value each of these '\' + // characters must be doubled on JSON input. + { + "name": "boot-file-name", + "data": "EST5EDT4\\,M3.2.0/02:00\\,M11.1.0/02:00" + }, + + // Options that take integer values can either be specified in + // dec or hex format. Hex format could be either plain (e.g. abcd) + // or prefixed with 0x (e.g. 0xabcd). + { + "name": "default-ip-ttl", + "data": "0xf0" + } + + // Note that Kea provides some of the options on its own. In particular, + // it sends IP Address lease type (code 51, based on valid-lifetime + // parameter, Subnet mask (code 1, based on subnet definition), Renewal + // time (code 58, based on renew-timer parameter), Rebind time (code 59, + // based on rebind-timer parameter). + ], + + // Other global parameters that can be defined here are option definitions + // (this is useful if you want to use vendor options, your own custom + // options or perhaps handle options that Kea does not handle out of the box + // yet). + + // You can also define classes. If classes are defined, incoming packets + // may be assigned to specific classes. A client class can represent any + // group of devices that share some common characteristic, e.g. Windows + // devices, iphones, broken printers that require special options, etc. + // Based on the class information, you can then allow or reject clients + // to use certain subnets, add special options for them or change values + // of some fixed fields. + "client-classes": [ + { + // This specifies a name of this class. It's useful if you need to + // reference this class. + "name": "voip", + + // This is a test. It is an expression that is being evaluated on + // each incoming packet. It is supposed to evaluate to either + // true or false. If it's true, the packet is added to specified + // class. See Section 12 for a list of available expressions. There + // are several dozens. Section 8.2.14 for more details for DHCPv4 + // classification and Section 9.2.19 for DHCPv6. + "test": "substring(option[60].hex,0,6) == 'Aastra'", + + // If a client belongs to this class, you can define extra behavior. + // For example, certain fields in DHCPv4 packet will be set to + // certain values. + "next-server": "192.0.2.254", + "server-hostname": "hal9000", + "boot-file-name": "/dev/null" + + // You can also define option values here if you want devices from + // this class to receive special options. + } + ], + + // Below an example of a simple IPv4 subnet declaration. Uncomment to enable + // it. This is a list, denoted with [ ], of structures, each denoted with + // { }. Each structure describes a single subnet and may have several + // parameters. One of those parameters is "pools" that is also a list of + // structures. + "subnet4": [ + { + // This defines the whole subnet. Kea will use this information to + // determine where the clients are connected. This is the whole + // subnet in your network. This is mandatory parameter for each + // subnet. + "subnet": "192.0.2.0/24", + + // Pools define the actual part of your subnet that is governed + // by Kea. Technically this is optional parameter, but it's + // almost always needed for DHCP to do its job. If you omit it, + // clients won't be able to get addresses, unless there are + // host reservations defined for them. + "pools": [ { "pool": "192.0.2.1 - 192.0.2.200" } ], + + // These are options that are subnet specific. In most cases, + // you need to define at least routers option, as without this + // option your clients will not be able to reach their default + // gateway and will not have Internet connectivity. + "option-data": [ + { + // For each IPv4 subnet you most likely need to specify at + // least one router. + "name": "routers", + "data": "192.0.2.1" + } + ], + + // Kea offers host reservations mechanism. Kea supports reservations + // by several different types of identifiers: hw-address + // (hardware/MAC address of the client), duid (DUID inserted by the + // client), client-id (client identifier inserted by the client) and + // circuit-id (circuit identifier inserted by the relay agent). + // + // Kea also support flexible identifier (flex-id), which lets you + // specify an expression that is evaluated for each incoming packet. + // Resulting value is then used for as an identifier. + // + // Note that reservations are subnet-specific in Kea. This is + // different than ISC DHCP. Keep that in mind when migrating + // your configurations. + "reservations": [ + + // This is a reservation for a specific hardware/MAC address. + // It's a rather simple reservation: just an address and nothing + // else. + { + "hw-address": "1a:1b:1c:1d:1e:1f", + "ip-address": "192.0.2.201" + }, + + // This is a reservation for a specific client-id. It also shows + // the this client will get a reserved hostname. A hostname can + // be defined for any identifier type, not just client-id. + { + "client-id": "01:11:22:33:44:55:66", + "ip-address": "192.0.2.202", + "hostname": "special-snowflake" + }, + + // The third reservation is based on DUID. This reservation defines + // a special option values for this particular client. If the + // domain-name-servers option would have been defined on a global, + // subnet or class level, the host specific values take preference. + { + "duid": "01:02:03:04:05", + "ip-address": "192.0.2.203", + "option-data": [ { + "name": "domain-name-servers", + "data": "10.1.1.202, 10.1.1.203" + } ] + }, + + // The fourth reservation is based on circuit-id. This is an option + // inserted by the relay agent that forwards the packet from client + // to the server. In this example the host is also assigned vendor + // specific options. + // + // When using reservations, it is useful to configure + // reservations-global, reservations-in-subnet, + // reservations-out-of-pool (subnet specific parameters) + // and host-reservation-identifiers (global parameter). + { + "client-id": "01:12:23:34:45:56:67", + "ip-address": "192.0.2.204", + "option-data": [ + { + "name": "vivso-suboptions", + "data": "4491" + }, + { + "name": "tftp-servers", + "space": "vendor-4491", + "data": "10.1.1.202, 10.1.1.203" + } + ] + }, + // This reservation is for a client that needs specific DHCPv4 + // fields to be set. Three supported fields are next-server, + // server-hostname and boot-file-name + { + "client-id": "01:0a:0b:0c:0d:0e:0f", + "ip-address": "192.0.2.205", + "next-server": "192.0.2.1", + "server-hostname": "hal9000", + "boot-file-name": "/dev/null" + }, + // This reservation is using flexible identifier. Instead of + // relying on specific field, sysadmin can define an expression + // similar to what is used for client classification, + // e.g. substring(relay[0].option[17],0,6). Then, based on the + // value of that expression for incoming packet, the reservation + // is matched. Expression can be specified either as hex or + // plain text using single quotes. + // + // Note: flexible identifier requires flex_id hook library to be + // loaded to work. + { + "flex-id": "'s0mEVaLue'", + "ip-address": "192.0.2.206" + } + // You can add more reservations here. + ] + // You can add more subnets there. + } + ], + + // There are many, many more parameters that DHCPv4 server is able to use. + // They were not added here to not overwhelm people with too much + // information at once. + + // Logging configuration starts here. Kea uses different loggers to log various + // activities. For details (e.g. names of loggers), see Chapter 18. + "loggers": [ + { + // This section affects kea-dhcp4, which is the base logger for DHCPv4 + // component. It tells DHCPv4 server to write all log messages (on + // severity INFO or more) to a file. + "name": "kea-dhcp4", + "output_options": [ + { + // Specifies the output file. There are several special values + // supported: + // - stdout (prints on standard output) + // - stderr (prints on standard error) + // - syslog (logs to syslog) + // - syslog:name (logs to syslog using specified name) + // Any other value is considered a name of the file + "output": "@localstatedir@/log/kea/kea-dhcp4.log" + + // Shorter log pattern suitable for use with systemd, + // avoids redundant information + // "pattern": "%-5p %m\n" + + // This governs whether the log output is flushed to disk after + // every write. + // "flush": false, + + // This specifies the maximum size of the file before it is + // rotated. + // "maxsize": 1048576, + + // This specifies the maximum number of rotated files to keep. + // "maxver": 8 + } + ], + // This specifies the severity of log messages to keep. Supported values + // are: FATAL, ERROR, WARN, INFO, DEBUG + "severity": "INFO", + + // If DEBUG level is specified, this value is used. 0 is least verbose, + // 99 is most verbose. Be cautious, Kea can generate lots and lots + // of logs if told to do so. + "debuglevel": 0 + } + ] +} +} diff --git a/net-misc/kea/files/kea-dhcp6-server.service b/net-misc/kea/files/kea-dhcp6-server.service new file mode 100644 index 00000000000..88e12c7abf3 --- /dev/null +++ b/net-misc/kea/files/kea-dhcp6-server.service @@ -0,0 +1,18 @@ +[Unit] +Description=ISC KEA IPv6 DHCP daemon +Documentation=man:kea-dhcp6(8) +Wants=network-online.target +Requires=kea-ctrl-agent.service +After=network-online.target mariadb.service mysql.service + +[Service] +User=dhcp +Group=dhcp +RuntimeDirectory=kea +Environment="KEA_PIDFILE_DIR=/run/kea" +Environment="KEA_LOCKFILE_DIR=/run/lock/kea" +ExecStart=/usr/local/sbin/kea-dhcp6 -c /etc/kea/kea-dhcp6.conf +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/kea/files/kea-dhcp6.conf b/net-misc/kea/files/kea-dhcp6.conf new file mode 100644 index 00000000000..e52e6305b88 --- /dev/null +++ b/net-misc/kea/files/kea-dhcp6.conf @@ -0,0 +1,420 @@ +// This is a basic configuration for the Kea DHCPv6 server. Subnet declarations +// are mostly commented out and no interfaces are listed. Therefore, the servers +// will not listen or respond to any queries. +// The basic configuration must be extended to specify interfaces on which +// the servers should listen. There are a number of example options defined. +// These probably don't make any sense in your network. Make sure you at least +// update the following, before running this example in your network: +// - change the network interface names +// - change the subnets to match your actual network +// - change the option values to match your network +// +// This is just a very basic configuration. Kea comes with large suite (over 30) +// of configuration examples and extensive Kea User's Guide. Please refer to +// those materials to get better understanding of what this software is able to +// do. Comments in this configuration file sometimes refer to sections for more +// details. These are section numbers in Kea User's Guide. The version matching +// your software should come with your Kea package, but it is also available +// in ISC's Knowledgebase (https://kea.readthedocs.io; the direct link for +// the stable version is https://kea.readthedocs.io/). +// +// 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 +// and will be ignored by other components. +"Dhcp6": { + // Add names of your network interfaces to listen on. + "interfaces-config": { + // You typically want to put specific interface names here, e.g. eth0 + // but you can also specify unicast addresses (e.g. eth0/2001:db8::1) if + // you want your server to handle unicast traffic in addition to + // multicast. (DHCPv6 is a multicast based protocol). + "interfaces": [ ] + }, + + // Kea supports control channel, which is a way to receive management commands + // while the server is running. This is a Unix domain socket that receives + // commands formatted in JSON, e.g. config-set (which sets new configuration), + // config-reload (which tells Kea to reload its configuration from file), + // statistic-get (to retrieve statistics) and many more. For detailed + // description, see Sections 9.12, 16 and 15. + "control-socket": { + "socket-type": "unix", + "socket-name": "/run/kea/kea6-ctrl-socket" + }, + + // Use Memfile lease database backend to store leases in a CSV file. + // Depending on how Kea was compiled, it may also support SQL databases + // (MySQL and/or PostgreSQL) and even Cassandra. Those database backends + // require more parameters, like name, host and possibly user and password. + // There are dedicated examples for each backend. See Section 8.2.2 "Lease + // Storage" for details. + "lease-database": { + // Memfile is the simplest and easiest backend to use. It's an in-memory + // C++ database that stores its state in CSV file. + "type": "memfile", + "lfc-interval": 3600 + }, + + // Kea allows storing host reservations in a database. If your network is + // small or you have few reservations, it's probably easier to keep them + // in the configuration file. If your network is large, it's usually better + // to use database for it. To enable it, uncomment the following: + // "hosts-database": { + // "type": "mysql", + // "name": "kea", + // "user": "kea", + // "password": "kea", + // "host": "localhost", + // "port": 3306 + // }, + // See Section 8.2.3 "Hosts storage" for details. + + // Setup reclamation of the expired leases and leases affinity. + // Expired leases will be reclaimed every 10 seconds. Every 25 + // seconds reclaimed leases, which have expired more than 3600 + // seconds ago, will be removed. The limits for leases reclamation + // are 100 leases or 250 ms for a single cycle. A warning message + // will be logged if there are still expired leases in the + // database after 5 consecutive reclamation cycles. + "expired-leases-processing": { + "reclaim-timer-wait-time": 10, + "flush-reclaimed-timer-wait-time": 25, + "hold-reclaimed-time": 3600, + "max-reclaim-leases": 100, + "max-reclaim-time": 250, + "unwarned-reclaim-cycles": 5 + }, + + // These parameters govern global timers. 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 + // respond after 2000 seconds since the lease was granted, a client is + // supposed to start REBIND procedure (emergency renewal that allows + // switching to a different server). + "renew-timer": 1000, + "rebind-timer": 2000, + "preferred-lifetime": 3000, + "valid-lifetime": 4000, + + // These are global options. They are going to be sent when a client requests + // them, unless overwritten with values in more specific scopes. The scope + // hierarchy is: + // - global + // - subnet + // - class + // - host + // + // Not all of those options make sense. Please configure only those that + // are actually useful in your network. + // + // For a complete list of options currently supported by Kea, see + // Section 8.2.9 "Standard DHCPv6 Options". Kea also supports + // vendor options (see Section 7.2.10) and allows users to define their + // own custom options (see Section 7.2.9). + "option-data": [ + // When specifying options, you typically need to specify + // one of (name or code) and data. The full option specification + // covers name, code, space, csv-format and data. + // space defaults to "dhcp6" which is usually correct, unless you + // use encapsulate options. csv-format defaults to "true", so + // this is also correct, unless you want to specify the whole + // option value as long hex string. For example, to specify + // domain-name-servers you could do this: + // { + // "name": "dns-servers", + // "code": 23, + // "csv-format": "true", + // "space": "dhcp6", + // "data": "2001:db8:2::45, 2001:db8:2::100" + // } + // but it's a lot of writing, so it's easier to do this instead: + { + "name": "dns-servers", + "data": "2001:db8:2::45, 2001:db8:2::100" + }, + + // Typically people prefer to refer to options by their names, so they + // don't need to remember the code names. However, some people like + // to use numerical values. For example, DHCPv6 can optionally use + // server unicast communication, if extra option is present. Option + // "unicast" uses option code 12, so you can reference to it either + // by "name": "unicast" or "code": 12. If you enable this option, + // you really should also tell the server to listen on that address + // (see interfaces-config/interfaces list above). + { + "code": 12, + "data": "2001:db8::1" + }, + + // String options that have a comma in their values need to have + // it escaped (i.e. each comma is preceded by two backslashes). + // That's because commas are reserved for separating fields in + // compound options. At the same time, we need to be conformant + // with JSON spec, that does not allow "\,". Therefore the + // slightly uncommon double backslashes notation is needed. + + // Legal JSON escapes are \ followed by "\/bfnrt character + // or \u followed by 4 hexadecimal numbers (currently Kea + // supports only \u0000 to \u00ff code points). + // CSV processing translates '\\' into '\' and '\,' into ',' + // only so for instance '\x' is translated into '\x'. But + // as it works on a JSON string value each of these '\' + // characters must be doubled on JSON input. + { + "name": "new-posix-timezone", + "data": "EST5EDT4\\,M3.2.0/02:00\\,M11.1.0/02:00" + }, + + // Options that take integer values can either be specified in + // dec or hex format. Hex format could be either plain (e.g. abcd) + // or prefixed with 0x (e.g. 0xabcd). + { + "name": "preference", + "data": "0xf0" + }, + + // A few options are encoded in (length, string) tuples + // which can be defined using only strings as the CSV + // processing computes lengths. + { + "name": "bootfile-param", + "data": "root=/dev/sda2, quiet, splash" + } + ], + + // Another thing possible here are hooks. Kea supports a powerful mechanism + // that allows loading external libraries that can extract information and + // even influence how the server processes packets. Those libraries include + // additional forensic logging capabilities, ability to reserve hosts in + // more flexible ways, and even add extra commands. For a list of available + // hook libraries, see https://gitlab.isc.org/isc-projects/kea/wikis/Hooks-available. + // "hooks-libraries": [ + // { + // // Forensic Logging library generates forensic type of audit trail + // // of all devices serviced by Kea, including their identifiers + // // (like MAC address), their location in the network, times + // // when they were active etc. + // "library": "@libdir@/kea/hooks/libdhcp_legal_log.so", + // "parameters": { + // "path": "/var/lib/kea", + // "base-name": "kea-forensic6" + // } + // }, + // { + // // Flexible identifier (flex-id). Kea software provides a way to + // // handle host reservations that include addresses, prefixes, + // // options, client classes and other features. The reservation can + // // be based on hardware address, DUID, circuit-id or client-id in + // // DHCPv4 and using hardware address or DUID in DHCPv6. However, + // // there are sometimes scenario where the reservation is more + // // complex, e.g. uses other options that mentioned above, uses part + // // of specific options or perhaps even a combination of several + // // options and fields to uniquely identify a client. Those scenarios + // // are addressed by the Flexible Identifiers hook application. + // "library": "@libdir@/kea/hooks/libdhcp_flex_id.so", + // "parameters": { + // "identifier-expression": "relay6[0].option[37].hex" + // } + // } + // ], + + // Below an example of a simple IPv6 subnet declaration. Uncomment to enable + // it. This is a list, denoted with [ ], of structures, each denoted with + // { }. Each structure describes a single subnet and may have several + // parameters. One of those parameters is "pools" that is also a list of + // structures. + "subnet6": [ + { + // This defines the whole subnet. Kea will use this information to + // determine where the clients are connected. This is the whole + // subnet in your network. This is mandatory parameter for each + // subnet. + "subnet": "2001:db8:1::/64", + + // Pools define the actual part of your subnet that is governed + // by Kea. Technically this is optional parameter, but it's + // almost always needed for DHCP to do its job. If you omit it, + // clients won't be able to get addresses, unless there are + // host reservations defined for them. + "pools": [ { "pool": "2001:db8:1::/80" } ], + + // Kea supports prefix delegation (PD). This mechanism delegates + // whole prefixes, instead of single addresses. You need to specify + // a prefix and then size of the delegated prefixes that it will + // be split into. This example below tells Kea to use + // 2001:db8:1::/56 prefix as pool and split it into /64 prefixes. + // This will give you 256 (2^(64-56)) prefixes. + "pd-pools": [ + { + "prefix": "2001:db8:8::", + "prefix-len": 56, + "delegated-len": 64 + + // Kea also supports excluded prefixes. This advanced option + // is explained in Section 9.2.9. Please make sure your + // excluded prefix matches the pool it is defined in. + // "excluded-prefix": "2001:db8:8:0:80::", + // "excluded-prefix-len": 72 + } + ], + "option-data": [ + // You can specify additional options here that are subnet + // specific. Also, you can override global options here. + { + "name": "dns-servers", + "data": "2001:db8:2::dead:beef, 2001:db8:2::cafe:babe" + } + ], + + // Host reservations can be defined for each subnet. + // + // Note that reservations are subnet-specific in Kea. This is + // different than ISC DHCP. Keep that in mind when migrating + // your configurations. + "reservations": [ + // This is a simple host reservation. The host with DUID matching + // the specified value will get an address of 2001:db8:1::100. + { + "duid": "01:02:03:04:05:0A:0B:0C:0D:0E", + "ip-addresses": [ "2001:db8:1::100" ] + }, + + // This is similar to the previous one, but this time the + // reservation is done based on hardware/MAC address. The server + // will do its best to extract the hardware/MAC address from + // received packets (see 'mac-sources' directive for + // details). This particular reservation also specifies two + // extra options to be available for this client. If there are + // options with the same code specified in a global, subnet or + // class scope, the values defined at host level take + // precedence. + { + "hw-address": "00:01:02:03:04:05", + "ip-addresses": [ "2001:db8:1::101" ], + "option-data": [ + { + "name": "dns-servers", + "data": "3000:1::234" + }, + { + "name": "nis-servers", + "data": "3000:1::234" + }], + + // This client will be automatically added to certain + // classes. + "client-classes": [ "special_snowflake", "office" ] + }, + + // This is a bit more advanced reservation. The client with the + // specified DUID will get a reserved address, a reserved prefix + // and a hostname. This reservation is for an address that it + // not within the dynamic pool. Finally, this reservation + // features vendor specific options for CableLabs, which happen + // to use enterprise-id 4491. Those particular values will be + // returned only to the client that has a DUID matching this + // reservation. + { + "duid": "01:02:03:04:05:06:07:08:09:0A", + "ip-addresses": [ "2001:db8:1:0:cafe::1" ], + "prefixes": [ "2001:db8:2:abcd::/64" ], + "hostname": "foo.example.com", + "option-data": [ + { + "name": "vendor-opts", + "data": "4491" + }, + { + "name": "tftp-servers", + "space": "vendor-4491", + "data": "3000:1::234" + } + ] + }, + + // This reservation is using flexible identifier. Instead of + // relying on specific field, sysadmin can define an expression + // similar to what is used for client classification, + // e.g. substring(relay[0].option[17],0,6). Then, based on the + // value of that expression for incoming packet, the reservation + // is matched. Expression can be specified either as hex or + // plain text using single quotes. + + // Note: flexible identifier requires flex_id hook library to be + // loaded to work. + { + "flex-id": "'somevalue'", + "ip-addresses": [ "2001:db8:1:0:cafe::2" ] + } + ] + } + // More subnets can be defined here. + // { + // "subnet": "2001:db8:2::/64", + // "pools": [ { "pool": "2001:db8:2::/80" } ] + // }, + // { + // "subnet": "2001:db8:3::/64", + // "pools": [ { "pool": "2001:db8:3::/80" } ] + // }, + // { + // "subnet": "2001:db8:4::/64", + // "pools": [ { "pool": "2001:db8:4::/80" } ] + // } + ], + + // Client-classes can be defined here. See "client-classes" in Dhcp4 for + // an example. + + // DDNS information (how the DHCPv6 component can reach a DDNS daemon) + + // Logging configuration starts here. Kea uses different loggers to log various + // activities. For details (e.g. names of loggers), see Chapter 18. + "loggers": [ + { + // This specifies the logging for kea-dhcp6 logger, i.e. all logs + // generated by Kea DHCPv6 server. + "name": "kea-dhcp6", + "output_options": [ + { + // Specifies the output file. There are several special values + // supported: + // - stdout (prints on standard output) + // - stderr (prints on standard error) + // - syslog (logs to syslog) + // - syslog:name (logs to syslog using specified name) + // Any other value is considered a name of the file + "output": "@localstatedir@/log/kea/kea-dhcp6.log" + + // Shorter log pattern suitable for use with systemd, + // avoids redundant information + // "pattern": "%-5p %m\n" + + // This governs whether the log output is flushed to disk after + // every write. + // "flush": false, + + // This specifies the maximum size of the file before it is + // rotated. + // "maxsize": 1048576, + + // This specifies the maximum number of rotated files to keep. + // "maxver": 8 + } + ], + // This specifies the severity of log messages to keep. Supported values + // are: FATAL, ERROR, WARN, INFO, DEBUG + "severity": "INFO", + + // If DEBUG level is specified, this value is used. 0 is least verbose, + // 99 is most verbose. Be cautious, Kea can generate lots and lots + // of logs if told to do so. + "debuglevel": 0 + } + ] +} +} diff --git a/net-misc/kea/files/kea.tmpfiles.conf b/net-misc/kea/files/kea.tmpfiles.conf new file mode 100644 index 00000000000..00423b07cfc --- /dev/null +++ b/net-misc/kea/files/kea.tmpfiles.conf @@ -0,0 +1,2 @@ +d /run/kea 0750 dhcp dhcp - +d /run/lock/kea 0750 dhcp dhcp - diff --git a/net-misc/kea/kea-1.8.2-r1.ebuild b/net-misc/kea/kea-1.8.2-r1.ebuild new file mode 100644 index 00000000000..7da321e5b81 --- /dev/null +++ b/net-misc/kea/kea-1.8.2-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV="${PV//_p/-P}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" +HOMEPAGE="http://www.isc.org/kea/"; + +inherit autotools systemd tmpfiles + +if [[ ${PV} = 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/isc-projects/kea.git"; +else + SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz + ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"; + [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script +SLOT="0" +IUSE="mysql +openssl postgres +samples test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/boost:= + dev-libs/log4cplus + mysql? ( dev-db/mysql-connector-c ) + !openssl? ( dev-libs/botan:2= ) + openssl? ( dev-libs/openssl:0= ) + postgres? ( dev-db/postgresql:* ) +" +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest )" +RDEPEND="${COMMON_DEPEND} + acct-group/dhcp + acct-user/dhcp" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.2-fix-cxx11-detection.patch + "${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch + "${FILESDIR}"/${PN}-1.8.2-gtest.patch +) + +src_prepare() { + default + # Brand the version with Gentoo + sed -i \ + -e "s/AC_INIT(kea,${PV}.*, kea-...@lists.isc.org)/AC_INIT(kea,${PVR}-gentoo, kea-...@lists.isc.org)/g" \ + configure.ac || die + + sed -i \ + -e '/mkdir -p $(DESTDIR)${runstatedir}\/${PACKAGE_NAME}/d' \ + Makefile.am || die "Fixing Makefile.am failed" + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-install-configurations + --disable-static + --enable-perfdhcp + --localstatedir="${EPREFIX}/var" + --runstatedir="${EPREFIX}/run" + --without-werror + $(use_with mysql) + $(use_with openssl) + $(use_with postgres pgsql) + $(use_enable test gtest) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} + newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} + + if use samples; then + diropts -m 0750 -o root -g dhcp + dodir /etc/kea + insopts -m 0640 -o root -g dhcp + insinto /etc/kea + doins "${FILESDIR}"/${PN}-ctrl-agent.conf + doins "${FILESDIR}"/${PN}-ddns-server.conf + doins "${FILESDIR}"/${PN}-dhcp4.conf + doins "${FILESDIR}"/${PN}-dhcp6.conf + fi + + systemd_dounit "${FILESDIR}"/${PN}-ctrl-agent.service + systemd_dounit "${FILESDIR}"/${PN}-ddns-server.service + systemd_dounit "${FILESDIR}"/${PN}-dhcp4-server.service + systemd_dounit "${FILESDIR}"/${PN}-dhcp6-server.service + + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf + + keepdir /var/lib/${PN} /var/log/${PN} + find "${ED}" -type f -name "*.la" -delete || die +} + +pkg_postinst() { + tmpfiles_process ${PN}.conf +} diff --git a/net-misc/kea/kea-1.9.10-r1.ebuild b/net-misc/kea/kea-1.9.10-r1.ebuild new file mode 100644 index 00000000000..7a7f2838d8c --- /dev/null +++ b/net-misc/kea/kea-1.9.10-r1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV="${PV//_p/-P}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" +HOMEPAGE="http://www.isc.org/kea/"; + +inherit autotools systemd tmpfiles + +if [[ ${PV} = 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/isc-projects/kea.git"; +else + SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz + ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"; + [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script +SLOT="0" +IUSE="mysql +openssl postgres +samples test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/boost:= + dev-libs/log4cplus + mysql? ( dev-db/mysql-connector-c ) + !openssl? ( dev-libs/botan:2= ) + openssl? ( dev-libs/openssl:0= ) + postgres? ( dev-db/postgresql:* )" +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest ) +" +RDEPEND="${COMMON_DEPEND} + acct-group/dhcp + acct-user/dhcp" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch + "${FILESDIR}"/${PN}-1.9.10-gtest.patch +) + +src_prepare() { + default + # Brand the version with Gentoo + sed -i \ + -e "s/AC_INIT(kea,${PV}.*, kea-...@lists.isc.org)/AC_INIT(kea,${PVR}-gentoo, kea-...@lists.isc.org)/g" \ + configure.ac || die + + sed -i \ + -e '/mkdir -p $(DESTDIR)${runstatedir}\/${PACKAGE_NAME}/d' \ + Makefile.am || die "Fixing Makefile.am failed" + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-install-configurations + --disable-static + --enable-perfdhcp + --localstatedir="${EPREFIX}/var" + --runstatedir="${EPREFIX}/run" + --without-werror + $(use_with mysql) + $(use_with openssl) + $(use_with postgres pgsql) + $(use_enable test gtest) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} + newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} + + if use samples; then + diropts -m 0750 -o root -g dhcp + dodir /etc/kea + insopts -m 0640 -o root -g dhcp + insinto /etc/kea + doins "${FILESDIR}"/${PN}-ctrl-agent.conf + doins "${FILESDIR}"/${PN}-ddns-server.conf + doins "${FILESDIR}"/${PN}-dhcp4.conf + doins "${FILESDIR}"/${PN}-dhcp6.conf + fi + + systemd_dounit "${FILESDIR}"/${PN}-ctrl-agent.service + systemd_dounit "${FILESDIR}"/${PN}-ddns-server.service + systemd_dounit "${FILESDIR}"/${PN}-dhcp4-server.service + systemd_dounit "${FILESDIR}"/${PN}-dhcp6-server.service + + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf + + keepdir /var/lib/${PN} /var/log/${PN} + find "${ED}" -type f -name "*.la" -delete || die +} + +pkg_postinst() { + tmpfiles_process ${PN}.conf +} diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index 444f89b948d..0d9eaa837ee 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -9,22 +9,25 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" HOMEPAGE="http://www.isc.org/kea/"; + +inherit autotools systemd tmpfiles + if [[ ${PV} = 9999* ]] ; then - inherit autotools git-r3 + inherit git-r3 EGIT_REPO_URI="https://github.com/isc-projects/kea.git"; else - SRC_URI="https://downloads.isc.org/isc/kea/${MY_PV}/${PN}-${MY_PV}.tar.gz"; + SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz + ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"; [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -IUSE="mysql +openssl postgres samples" +IUSE="mysql +openssl postgres +samples" DEPEND=" dev-libs/boost:= - dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) @@ -40,23 +43,29 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default - [[ ${PV} = *9999 ]] && eautoreconf # Brand the version with Gentoo sed -i \ - -e "/VERSION=/s:'$: Gentoo-${PR}':" \ - configure || die + -e "s/AC_INIT(kea,${PV}.*, kea-...@lists.isc.org)/AC_INIT(kea,${PVR}-gentoo, kea-...@lists.isc.org)/g" \ + configure.ac || die + + sed -i \ + -e '/mkdir -p $(DESTDIR)${runstatedir}\/${PACKAGE_NAME}/d' \ + Makefile.am || die "Fixing Makefile.am failed" + + eautoreconf } src_configure() { local myeconfargs=( + --disable-install-configurations --disable-static --enable-perfdhcp --localstatedir="${EPREFIX}/var" + --runstatedir="${EPREFIX}/run" --without-werror $(use_with mysql) $(use_with openssl) $(use_with postgres pgsql) - $(use_enable samples install-configurations) ) econf "${myeconfargs[@]}" } @@ -65,7 +74,29 @@ src_install() { default newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} - keepdir /var/lib/${PN} /var/log - rm -rf "${ED}"/var/run || die + + if use samples; then + diropts -m 0750 -o root -g dhcp + dodir /etc/kea + insopts -m 0640 -o root -g dhcp + insinto /etc/kea + doins "${FILESDIR}"/${PN}-ctrl-agent.conf + doins "${FILESDIR}"/${PN}-ddns-server.conf + doins "${FILESDIR}"/${PN}-dhcp4.conf + doins "${FILESDIR}"/${PN}-dhcp6.conf + fi + + systemd_dounit "${FILESDIR}"/${PN}-ctrl-agent.service + systemd_dounit "${FILESDIR}"/${PN}-ddns-server.service + systemd_dounit "${FILESDIR}"/${PN}-dhcp4-server.service + systemd_dounit "${FILESDIR}"/${PN}-dhcp6-server.service + + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf + + keepdir /var/lib/${PN} /var/log/${PN} find "${ED}" -type f -name "*.la" -delete || die } + +pkg_postinst() { + tmpfiles_process ${PN}.conf +} diff --git a/net-misc/kea/metadata.xml b/net-misc/kea/metadata.xml index b04fc98d468..f291216f885 100644 --- a/net-misc/kea/metadata.xml +++ b/net-misc/kea/metadata.xml @@ -9,8 +9,18 @@ <email>chain...@gentoo.org</email> <name>Tony Vroon</name> </maintainer> + <maintainer type="person"> + <email>expedition...@gentoo.org</email> + <name>Dennis Lamm</name> + </maintainer> <use> <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> instead of <pkg>dev-libs/botan</pkg></flag> <flag name="samples">Install sample configuration files</flag> </use> + <upstream> + <bugs-to>https://gitlab.isc.org/isc-projects/kea/-/issues</bugs-to> + <doc>https://kea.readthedocs.io</doc> + <remote-id type="cpe">cpe:/a:isc:kea</remote-id> + <remote-id type="github">isc-projects/kea</remote-id> + </upstream> </pkgmetadata>
