commit: fd0936ef936ff2bfcc8a976f5554d7954996eb2b
Author: Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 20 21:49:38 2025 +0000
Commit: Joshua Kinard <kumba <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 21:49:38 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0936ef
net-dns/nsd: Remove unneeded files in FILESDIR
The init.d, conf.d, and tmpfiles.d files in FILESDIR are part
of upstream now, in the contrib/ folder in the source, so these
copies are no longer needed.
Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org>
net-dns/nsd/files/nsd.confd-r1 | 16 ------------
net-dns/nsd/files/nsd.initd-r2 | 52 --------------------------------------
net-dns/nsd/files/nsd.tmpfilesd-r1 | 1 -
3 files changed, 69 deletions(-)
diff --git a/net-dns/nsd/files/nsd.confd-r1 b/net-dns/nsd/files/nsd.confd-r1
deleted file mode 100644
index 7c9a7effb844..000000000000
--- a/net-dns/nsd/files/nsd.confd-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-# /etc/conf.d/nsd
-
-# NSD_ARGS is set by default to run in the foreground (-d) and to not
-# create its own PID file (-P ''), as we let OpenRC handle that instead.
-# It is recommended to keep these defaults and append additional flags
-# to them.
-NSD_ARGS="-d -P ''"
-
-# NSD_CONFBASE sets the base configuration directory for nsd's
-# configuration and, by default, uses the standard '/etc/nsd' path.
-NSD_CONFBASE="/etc/nsd"
-
-# NSD_CONFNAME sets the first part of the nsd config file name to be that
-# of the calling service script name. This allows you to create symlinks
-# that point at '/etc/init.d/nsd' for different instances of nsd.
-NSD_CONFNAME="${RC_SVCNAME}.conf"
diff --git a/net-dns/nsd/files/nsd.initd-r2 b/net-dns/nsd/files/nsd.initd-r2
deleted file mode 100644
index e1825433ac3b..000000000000
--- a/net-dns/nsd/files/nsd.initd-r2
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="NSD is an authoritative-only, high performance, open source name
server"
-extra_commands="configtest"
-extra_started_commands="reload"
-
-# These can be overridden in /etc/conf.d/nsd if necessary.
-NSD_ARGS="${NSD_ARGS:--d -P ''}"
-NSD_CONFBASE="${NSD_CONFBASE:-/etc/nsd}"
-NSD_CONFNAME="${NSD_CONFNAME:-${RC_SVCNAME}.conf}"
-
-# The conf.d defaults shipped with nsd-4.9.1+ will run it in the foreground
-# and tell it not to create a PID file, as we allow OpenRC to handle those
-# details.
-config_file="${NSD_CONFBASE}/${NSD_CONFNAME}"
-checkconf="/usr/sbin/nsd-checkconf"
-command="/usr/sbin/nsd"
-command_args="-c ${config_file} ${NSD_ARGS}"
-command_background=true
-pidfile="/run/${RC_SVCNAME}.pid"
-required_files="${config_file}"
-
-depend() {
- use logger
-}
-
-checkconfig() {
- if ! "${checkconf}" "${config_file}"; then
- eerror "You have errors in your configfile (${config_file})"
- return $?
- fi
- return 0
-}
-
-configtest() {
- ebegin "Checking ${RC_SVCNAME} configuration"
- checkconfig
- eend $?
-}
-
-start_pre() {
- checkconfig || return $?
-}
-
-reload() {
- checkconfig || return $?
- ebegin "Reloading config and zone files"
- start-stop-daemon --signal HUP --pidfile "${pidfile}"
- eend $?
-}
diff --git a/net-dns/nsd/files/nsd.tmpfilesd-r1
b/net-dns/nsd/files/nsd.tmpfilesd-r1
deleted file mode 100644
index 0e2211770cd2..000000000000
--- a/net-dns/nsd/files/nsd.tmpfilesd-r1
+++ /dev/null
@@ -1 +0,0 @@
-d /run/nsd 0750 nsd nsd
