[gentoo-commits] gentoo-x86 commit in net-firewall/conntrack-tools/files: conntrackd.initd-r3 conntrackd.confd-r2

[gentoo-commits] gentoo-x86 commit in net-firewall/conntrack-tools/files: conntrackd.initd-r3 conntrackd.confd-r2

[Sergey Popov (pinkbyte)]

pinkbyte    13/08/20 09:46:54

  Added:                conntrackd.initd-r3 conntrackd.confd-r2
  Log:
  Version bump: drop redundant src_configure, fix path to lock directory, wrt bug #474858. Thanks to Jeroen Roovers for discovering this issue
  
  (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

Revision  Changes    Path
1.1                  net-firewall/conntrack-tools/files/conntrackd.initd-r3

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/conntrack-tools/files/conntrackd.initd-r3?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/conntrack-tools/files/conntrackd.initd-r3?rev=1.1&content-type=text/plain

Index: conntrackd.initd-r3
===================================================================
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

CONNTRACKD_BIN="/usr/sbin/conntrackd"
CONNTRACKD_CFG=${CONNTRACKD_CFG:-/etc/conntrackd/conntrackd.conf}
CONNTRACKD_LOCK=${CONNTRACKD_LOCK:-/run/lock/conntrack.lock}

depend() {
	use logger
	need net
}

checkconfig() {
	# check for netfilter conntrack kernel support
	local nf_ct_available=0
	for k in net.netfilter.nf_conntrack_max \
		net.ipv4.netfilter.ip_conntrack_max \
		net.nf_conntrack_max; do
		if sysctl -e -n ${k} &>/dev/null; then
			nf_ct_available=1 # sysctl key found
			break
		fi
	done
	if [ ${nf_ct_available} -eq 0 ]; then
		eerror
		eerror "Your kernel is missing netfilter conntrack support!"
		eerror "Make sure your kernel was compiled with netfilter conntrack support."
		eerror
		eerror "If it was compiled as a module you need to ensure the module is being"
		eerror "loaded before starting conntrackd."
		eerror "Either add an entry to /etc/modules.autoload/[...] (for baselayout-1)"
		eerror "or /etc/conf.d/modules (for baselayout-2/OpenRC) or load the module"
		eerror "by hand like this, depending on your kernel version:"
		eerror
		eerror "  modprobe nf_conntrack # (for newer kernels)"
		eerror "  modprobe ip_conntrack # (for older kernels)"
		eerror
		return 1
	fi
	# check for config file
	if [ ! -e "${CONNTRACKD_CFG}" ]; then
		eerror
		eerror "The conntrackd config file (${CONNTRACKD_CFG})"
		eerror "is missing!"
		eerror
		return 1
	fi
	# check for leftover lockfile
	if [ -f "${CONNTRACKD_LOCK}" ]; then
		ewarn
		ewarn "The conntrackd lockfile (${CONNTRACKD_LOCK})"
		ewarn "exists although the service is not marked as started."
		ewarn "Will remove the lockfile and start the service in 10s"
		ewarn "if not interrupted..."
		ewarn
		sleep 10
		if ! rm -f "${CONNTRACKD_LOCK}"; then
			eerror "Failed to remove the conntrackd lockfile (${CONNTRACKD_LOCK})"
			return 1
		fi
	fi
}

start() {
	checkconfig || return 1
	ebegin "Starting conntrackd"
	start-stop-daemon --start --exec "${CONNTRACKD_BIN}" \
		-- -d -C "${CONNTRACKD_CFG}" ${CONNTRACKD_OPTS}
	eend $?
}

stop() {
	ebegin "Stopping conntrackd"
	start-stop-daemon --stop --exec "${CONNTRACKD_BIN}"
	eend $?
}



1.1                  net-firewall/conntrack-tools/files/conntrackd.confd-r2

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/conntrack-tools/files/conntrackd.confd-r2?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/conntrack-tools/files/conntrackd.confd-r2?rev=1.1&content-type=text/plain

Index: conntrackd.confd-r2
===================================================================
# conntrackd config file
# default: /etc/conntrackd/conntrackd.conf
#CONNTRACKD_CFG=/etc/conntrackd/conntrackd.conf

# conntrackd lockfile (must match the "LockFile" entry
# from the "General" section in the config file)
# default: /run/lock/conntrack.lock
#CONNTRACKD_LOCK=/run/lock/conntrack.lock

# extra options for conntrackd
#CONNTRACKD_OPTS="" # you must NOT use -C here!

# depend on a specific network interface
#rc_need="net.eth1"