diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /net-misc/kea/files | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'net-misc/kea/files')
| -rw-r--r-- | net-misc/kea/files/kea-confd | 4 | ||||
| -rw-r--r-- | net-misc/kea/files/kea-confd-r1 | 10 | ||||
| -rw-r--r-- | net-misc/kea/files/kea-initd-r1 (renamed from net-misc/kea/files/kea-initd) | 24 |
3 files changed, 23 insertions, 15 deletions
diff --git a/net-misc/kea/files/kea-confd b/net-misc/kea/files/kea-confd deleted file mode 100644 index 568468eb3a1d..000000000000 --- a/net-misc/kea/files/kea-confd +++ /dev/null @@ -1,4 +0,0 @@ -# Which services should be taken into account? -DHCP4="true" -DHCP6="false" -DDNS="false" diff --git a/net-misc/kea/files/kea-confd-r1 b/net-misc/kea/files/kea-confd-r1 new file mode 100644 index 000000000000..ef7b2f49dd9d --- /dev/null +++ b/net-misc/kea/files/kea-confd-r1 @@ -0,0 +1,10 @@ +# Which services should be taken into account? +DHCP4="true" +DHCP6="false" +DDNS="false" + +# Define your config files here. Otherwise we default to files in /etc/kea +# (see init script) +#DHCP4_CONFIG="/etc/kea/dhcp4.conf" +#DHCP6_CONFIG="/etc/kea/dhcp6.conf" +#DDNS_CONFIG="/etc/kea/ddns.conf" diff --git a/net-misc/kea/files/kea-initd b/net-misc/kea/files/kea-initd-r1 index 85fdd56b9ec2..57711b3c9d36 100644 --- a/net-misc/kea/files/kea-initd +++ b/net-misc/kea/files/kea-initd-r1 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="kea dhcp services" @@ -7,7 +7,9 @@ description="kea dhcp services" dhcp4_command="/usr/sbin/kea-dhcp4" dhcp6_command="/usr/sbin/kea-dhcp6" ddns_command="/usr/sbin/kea-dhcp-ddns" -config_file="/etc/kea/kea.conf" +dhcp4_config="${DHCP4_CONFIG:-/etc/kea/dhcp4.conf}" +dhcp6_config="${DHCP6_CONFIG:-/etc/kea/dhcp6.conf}" +ddns_config="${DDNS_CONFIG:-/etc/kea/ddns.conf}" dhcp4_pidfile="/run/kea-dhcp4.pid" dhcp6_pidfile="/run/kea-dhcp6.pid" ddns_pidfile="/run/kea-ddns.pid" @@ -23,20 +25,20 @@ start_pre() { fi if ${DHCP4:-false} ; then - if ! ${dhcp4_command} -t ${config_file} 1>/dev/null 2>/dev/null ; then - eerror "Error in config file." + if ! ${dhcp4_command} -t ${dhcp4_config} 1>/dev/null 2>/dev/null ; then + eerror "Error in config file ${dhcp4_config}" return 1 fi fi if ${DHCP6:-false} ; then - if ! ${dhcp6_command} -t ${config_file} 1>/dev/null 2>/dev/null ; then - eerror "Error in config file." + if ! ${dhcp6_command} -t ${dhcp6_config} 1>/dev/null 2>/dev/null ; then + eerror "Error in config file ${dhcp6_config}" return 1 fi fi if ${DDNS:-false} ; then - if ! ${ddns_command} -t ${config_file} 1>/dev/null 2>/dev/null ; then - eerror "Error in config file." + if ! ${ddns_command} -t ${ddns_config} 1>/dev/null 2>/dev/null ; then + eerror "Error in config file ${ddns_config}" return 1 fi fi @@ -46,17 +48,17 @@ start() { einfo "Starting kea dhcp services" if ${DHCP4:-false} ; then start-stop-daemon -m -b -p ${dhcp4_pidfile} \ - -x ${dhcp4_command} -- -c ${config_file} \ + -x ${dhcp4_command} -- -c ${dhcp4_config} \ || return 1 fi if ${DHCP6:-false} ; then start-stop-daemon -m -b -p ${dhcp6_pidfile} \ - -x ${dhcp6_command} -- -c ${config_file} \ + -x ${dhcp6_command} -- -c ${dhcp6_config} \ || return 1 fi if ${DDNS:-false} ; then start-stop-daemon -m -b -p ${ddns_pidfile} \ - -x ${ddns_command} -- -c ${config_file} \ + -x ${ddns_command} -- -c ${ddns_config} \ || return 1 fi } |