From d07ba8eabac786c8516ae12f020590bb3cd0f014 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 11 Oct 2011 04:42:34 +0200 Subject: [PATCH] rsyslog: switch to systemd, drop openrc support. --- srcpkgs/rsyslog/files/rsyslogd.confd | 13 ------------- srcpkgs/rsyslog/files/rsyslogd.rc | 23 ----------------------- srcpkgs/rsyslog/template | 8 +++----- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/rsyslog/files/rsyslogd.confd delete mode 100644 srcpkgs/rsyslog/files/rsyslogd.rc diff --git a/srcpkgs/rsyslog/files/rsyslogd.confd b/srcpkgs/rsyslog/files/rsyslogd.confd deleted file mode 100644 index 80e8e688dd6..00000000000 --- a/srcpkgs/rsyslog/files/rsyslogd.confd +++ /dev/null @@ -1,13 +0,0 @@ -# Config file for /etc/init.d/rsyslog - -CONFIGFILE="/etc/rsyslog.conf" -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 -# * "-c4" tells rsyslog to _not_ run in sysklogd compatibility mode - -RSYSLOGD_OPTS="-c4" diff --git a/srcpkgs/rsyslog/files/rsyslogd.rc b/srcpkgs/rsyslog/files/rsyslogd.rc deleted file mode 100644 index ddcc1d15671..00000000000 --- a/srcpkgs/rsyslog/files/rsyslogd.rc +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript - -pidfile=${PIDFILE} -command=/usr/sbin/rsyslogd -command_args="${RSYSLOGD_OPTS} -i ${pidfile} -f ${CONFIGFILE}" -opts="reload" - -depend() -{ - provide logger -} - -reload() -{ - if [ ! -f "${PIDFILE}" ]; then - eerror "rsyslogd not running" - return 1 - fi - ebegin "Reloading configuration and re-opening log files" - start-stop-daemon --stop --oknodo --signal HUP \ - --pidfile "${PIDFILE}" - eend $? -} diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index d1059e188fe..5f0117a4462 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,7 +1,7 @@ # Template file for 'rsyslog' pkgname=rsyslog version=5.8.5 -revision=1 +revision=2 homepage="http://www.rsyslog.com" distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" build_style=gnu_configure @@ -19,8 +19,8 @@ long_desc=" subpackages="$pkgname-docs $pkgname-gssapi $pkgname-gnutls" subpackages="${subpackages} $pkgname-mysql $pkgname-postgresql" -conf_files="/etc/rsyslog.conf /etc/conf.d/rsyslogd" -openrc_services="rsyslogd default true" +conf_files="/etc/rsyslog.conf" +systemd_services="rsyslog.service" provides="syslog-daemon-0" replaces="syslog-daemon>=0" @@ -35,8 +35,6 @@ Add_dependency build mit-krb5-devel post_install() { - vinstall ${FILESDIR}/rsyslogd.rc 755 etc/init.d rsyslogd - vinstall ${FILESDIR}/rsyslogd.confd 644 etc/conf.d rsyslogd vinstall ${FILESDIR}/rsyslog.conf 644 etc vinstall ${FILESDIR}/rsyslog.logrotate 644 etc/logrotate.d rsyslog # Install HTML documentation.