Attachment #323662 for bug #434902

View | Details | Raw Unified | Return to bug 434902
Collapse All | Expand All




# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.confd,v 1.1 2010/10/21 07:38:29 dev-zero Exp $

# Define the keytab to pull the kerberos 5 key from. Leave blank to disable
# krb5 features in the init script
KRB5_KTNAME="/etc/${SVCNAME}.keytab"

# Define the kerberos 5 credentials cache file to utilize for the rsyslogd service
# This file will be created on start by the k5start utility and owned by
# the syslog user
KRB5CCNAME="/tmp/krb5cc_${SVCNAME}"

# Define the principle to obtain a kerberos 5 key for
KRB5_PRINC="log/host.example.com"

# Define the time (in minutes) to refresh kerberos credentials. Without this,
# rsyslogd's credentials would eventually expire and no longer be able to send krb5
# messages to your rsyslogd server. The setting below sets it to one minute before
# 8 hours
KRB5_TICKET_TIME=479

# Define the k5start pid file
KRB_PIDFILE="/var/run/k5rsyslogd.pid"

# Configuration file
CONFIGFILE="/etc/rsyslog.conf"

# PID file
PIDFILE="/var/run/rsyslogd.pid"

# Options to rsyslogd
# See rsyslogd(8) for more details
# Notes:
# * Do not specify another PIDFILE but use the variable above to change the location
# * Do not specify another CONFIGFILE but use the variable above to change the location
# * "-c5" tells rsyslog to _not_ run in sysklogd compatibility mode
RSYSLOG_OPTS="-c5"




#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.4 2012/08/24 14:40:14 ultrabug Exp $

extra_started_commands="reload"

depend() {
	provide logger
}

start() {
	if [ -n "${KRB5_KTNAME}" ] ; then
		ebegin "Starting ${SVCNAME}"
		start-stop-daemon \
			--start --quiet --exec /usr/bin/k5start --pidfile "${KRB_PIDFILE}" -e KRB5_KTNAME="${KRB5_KTNAME}" -e KRB5CCNAME="${KRB5CCNAME}" -- \
			-bqf "${KRB5_KTNAME}" -K ${KRB5_TICKET_TIME} -p "${KRB_PIDFILE}" ${KRB5_PRINC} -- \
			/usr/sbin/rsyslogd ${RSYSLOG_OPTS} -i "${PIDFILE}" -nf "${CONFIGFILE}"
		eend $?
	else
		ebegin "Starting ${SVCNAME}"
		start-stop-daemon \
			--start --quiet --exec /usr/sbin/rsyslogd --pidfile "${PIDFILE}" -- \
			${RSYSLOG_OPTS} -i "${PIDFILE}" -f "${CONFIGFILE}"
		eend $?
	fi
}

stop() {
	ebegin "Stopping rsyslogd"
	start-stop-daemon \
		--stop --quiet --pidfile "${PIDFILE}"
	eend $?
}

reload() {
	if [ ! -f "${PIDFILE}" ]; then
		eerror "rsyslogd not running"
		return 1
	fi

	# Baselayout-1 users still use --stop and --oknodo
	local USEROPT="--name rsyslogd"
	if [ ! -f /etc/init.d/sysfs ]; then
		USEROPT="--stop --oknodo"
	fi

	ebegin "Re-opening rsyslogd log files"
	start-stop-daemon --signal HUP --pidfile "${PIDFILE}" ${USEROPT}
	eend $?
}

Lines 19-25 Link Here

(-)old/rsyslog-5.8.11.ebuild (-3 / +14 lines)
19		19
20	RDEPEND="dbi? ( dev-db/libdbi )	20	RDEPEND="dbi? ( dev-db/libdbi )
21	extras? ( net-libs/libnet )	21	extras? ( net-libs/libnet )
22	kerberos? ( virtual/krb5 )	22	kerberos? ( virtual/krb5
		23	app-crypt/kstart )
23	mysql? ( virtual/mysql )	24	mysql? ( virtual/mysql )
24	postgres? ( dev-db/postgresql-base )	25	postgres? ( dev-db/postgresql-base )
25	oracle? ( dev-db/oracle-instantclient-basic )	26	oracle? ( dev-db/oracle-instantclient-basic )
Lines 119-126 Link Here
119		120
120	insinto /etc	121	insinto /etc
121	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf	122	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
122	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}	123	if use kerberos ; then
123	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}	124	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd.krb" ${PN}
		125	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd.krb" ${PN}
		126	else
		127	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
		128	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
		129	fi
124	keepdir /var/spool/${PN}	130	keepdir /var/spool/${PN}
125	keepdir /etc/ssl/${PN}	131	keepdir /etc/ssl/${PN}
126	keepdir /etc/${PN}.d	132	keepdir /etc/${PN}.d
Lines 156-161 Link Here
156	elog "once for each logging client. The client certificates will be signed"	162	elog "once for each logging client. The client certificates will be signed"
157	elog "using the CA certificate generated during the first run."	163	elog "using the CA certificate generated during the first run."
158	fi	164	fi
		165	if use kerberos ; then
		166	echo
		167	elog "Remember to create a keytab file for ${PN} and configure"
		168	elog "/etc/conf.d/${PN} as appropriate."
		169	fi
159	}	170	}
160		171
161	pkg_config() {	172	pkg_config() {

Return to bug 434902

Line 0 Link Here

(-)old/files/5-stable/rsyslog.confd.krb (+38 lines)
	1	# Copyright 1999-2010 Gentoo Foundation
	2	# Distributed under the terms of the GNU General Public License v2
	3	# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.confd,v 1.1 2010/10/21 07:38:29 dev-zero Exp $
	4
	5	# Define the keytab to pull the kerberos 5 key from. Leave blank to disable
	6	# krb5 features in the init script
	7	KRB5_KTNAME="/etc/${SVCNAME}.keytab"
	8
	9	# Define the kerberos 5 credentials cache file to utilize for the rsyslogd service
	10	# This file will be created on start by the k5start utility and owned by
	11	# the syslog user
	12	KRB5CCNAME="/tmp/krb5cc_${SVCNAME}"
	13
	14	# Define the principle to obtain a kerberos 5 key for
	15	KRB5_PRINC="log/host.example.com"
	16
	17	# Define the time (in minutes) to refresh kerberos credentials. Without this,
	18	# rsyslogd's credentials would eventually expire and no longer be able to send krb5
	19	# messages to your rsyslogd server. The setting below sets it to one minute before
	20	# 8 hours
	21	KRB5_TICKET_TIME=479
	22
	23	# Define the k5start pid file
	24	KRB_PIDFILE="/var/run/k5rsyslogd.pid"
	25
	26	# Configuration file
	27	CONFIGFILE="/etc/rsyslog.conf"
	28
	29	# PID file
	30	PIDFILE="/var/run/rsyslogd.pid"
	31
	32	# Options to rsyslogd
	33	# See rsyslogd(8) for more details
	34	# Notes:
	35	# * Do not specify another PIDFILE but use the variable above to change the location
	36	# * Do not specify another CONFIGFILE but use the variable above to change the location
	37	# * "-c5" tells rsyslog to _not_ run in sysklogd compatibility mode
	38	RSYSLOG_OPTS="-c5"

Line 0 Link Here

(-)old/files/5-stable/rsyslog.initd.krb (+51 lines)
	1	#!/sbin/runscript
	2	# Copyright 1999-2012 Gentoo Foundation
	3	# Distributed under the terms of the GNU General Public License v2
	4	# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.4 2012/08/24 14:40:14 ultrabug Exp $
	5
	6	extra_started_commands="reload"
	7
	8	depend() {
	9	provide logger
	10	}
	11
	12	start() {
	13	if [ -n "${KRB5_KTNAME}" ] ; then
	14	ebegin "Starting ${SVCNAME}"
	15	start-stop-daemon \
	16	--start --quiet --exec /usr/bin/k5start --pidfile "${KRB_PIDFILE}" -e KRB5_KTNAME="${KRB5_KTNAME}" -e KRB5CCNAME="${KRB5CCNAME}" -- \
	17	-bqf "${KRB5_KTNAME}" -K ${KRB5_TICKET_TIME} -p "${KRB_PIDFILE}" ${KRB5_PRINC} -- \
	18	/usr/sbin/rsyslogd ${RSYSLOG_OPTS} -i "${PIDFILE}" -nf "${CONFIGFILE}"
	19	eend $?
	20	else
	21	ebegin "Starting ${SVCNAME}"
	22	start-stop-daemon \
	23	--start --quiet --exec /usr/sbin/rsyslogd --pidfile "${PIDFILE}" -- \
	24	${RSYSLOG_OPTS} -i "${PIDFILE}" -f "${CONFIGFILE}"
	25	eend $?
	26	fi
	27	}
	28
	29	stop() {
	30	ebegin "Stopping rsyslogd"
	31	start-stop-daemon \
	32	--stop --quiet --pidfile "${PIDFILE}"
	33	eend $?
	34	}
	35
	36	reload() {
	37	if [ ! -f "${PIDFILE}" ]; then
	38	eerror "rsyslogd not running"
	39	return 1
	40	fi
	41
	42	# Baselayout-1 users still use --stop and --oknodo
	43	local USEROPT="--name rsyslogd"
	44	if [ ! -f /etc/init.d/sysfs ]; then
	45	USEROPT="--stop --oknodo"
	46	fi
	47
	48	ebegin "Re-opening rsyslogd log files"
	49	start-stop-daemon --signal HUP --pidfile "${PIDFILE}" ${USEROPT}
	50	eend $?
	51	}