Commit 732c1606 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[3422] keactrl and related configuration files are now installed.

parent 26686d71
......@@ -1457,6 +1457,7 @@ AC_CONFIG_FILES([compatcheck/Makefile
src/bin/dhcp6/tests/test_data_files_config.h
src/bin/dhcp6/tests/test_libraries.h
src/bin/keactrl/keactrl
src/bin/keactrl/keactrl.conf
src/bin/keactrl/Makefile
src/bin/keactrl/tests/keactrl_tests.sh
src/bin/keactrl/tests/Makefile
......
# The following build order must be maintained.
SUBDIRS = bind10 bindctl cfgmgr msgq cmdctl \
usermgr stats tests sockcreator dhcp4 dhcp6 \
d2 sysinfo
d2 sysinfo keactrl
check-recursive: all-recursive
SUBDIRS = . tests
# Install keactrl in sbin and the keactrl.conf required by the keactrl
# in etc. keactrl will look for its configuration file in the etc folder.
# If the default location needs to be changed the it may be achieved by
# setting KEACTRL_CONF environment variable.
sbin_SCRIPTS = keactrl
CLEANFILES = keactrl
CONFIGFILES = keactrl.conf
EXTRA_DIST = keactrl.in
DISTCLEANFILES = keactrl keactrl.conf
EXTRA_DIST = keactrl.in keactrl.conf.in
install-data-local:
$(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@
for f in $(CONFIGFILES) ; do \
if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \
${INSTALL_DATA} $$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/ ; \
fi ; \
done
# This is a configuration file for keactrl script which controls
# the startup, shutdown, reconfiguration and gathering the status
# of the Kea's processes.
# prefix holds the location where the Kea is installed.
prefix=@prefix@
# Location of Kea configuration file.
kea_config_file=@sysconfdir@/@PACKAGE@/kea.conf
# Start DHCPv4 server?
kea4=yes
# Start DHCPv6 server?
kea6=yes
# Be verbose?
kea_verbose=no
......@@ -133,10 +133,10 @@ if test -n "${KEACTRL_BUILD_DIR}"; then
else
prefix=@prefix@
exec_prefix=@exec_prefix@
dhcpv4_srv=@libexecdir@/@PACKAGE@/dhcp4/b10-dhcp4
dhcpv6_srv=@libexecdir@/@PACKAGE@/dhcp6/b10-dhcp6
dhcpv4_srv=@libexecdir@/@PACKAGE@/b10-dhcp4
dhcpv6_srv=@libexecdir@/@PACKAGE@/b10-dhcp6
dhcp_ddns=@libexecdir@/@PACKAGE@/b10-dhcp-ddns
keactrl_conf=@etcdir@/@PACKAGE@/keactrl.conf
keactrl_conf=@sysconfdir@/@PACKAGE@/keactrl.conf
fi
# KEACTRL_CONF environment variable may hold a location of the keactrl
......@@ -148,7 +148,7 @@ fi
# Check if the file exists. If it doesn't, it is a fatal error.
if [ ! -f ${keactrl_conf} ]; then
log_error "keactrl configuration file doesn't exist."
log_error "keactrl configuration file doesn't exist in ${keactrl_conf}."
exit 1
fi
......@@ -160,6 +160,9 @@ fi
if [ -z ${kea_config_file} ]; then
log_error "Configuration file for Kea not specified."
exit 1
elif [ ! -f ${kea_config_file} ]; then
log_error "Configuration file for Kea does not exist: ${kea_config_file}."
exit 1
fi
# kea4 and kea6 (=yes) indicate if we should start DHCPv4 and DHCPv6 server
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment