| 1 |
mr_bones_ 13/04/29 17:32:59 |
| 2 |
|
| 3 |
Modified: syslog-ng.rc6 |
| 4 |
Log: |
| 5 |
use required_* runscript variables; STATEFILE_DIR typo |
| 6 |
|
| 7 |
(Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 app-admin/syslog-ng/files/3.4/syslog-ng.rc6 |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: syslog-ng.rc6 |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- syslog-ng.rc6 29 Apr 2013 17:27:28 -0000 1.2 |
| 23 |
+++ syslog-ng.rc6 29 Apr 2013 17:32:59 -0000 1.3 |
| 24 |
@@ -1,10 +1,10 @@ |
| 25 |
#!/sbin/runscript |
| 26 |
# Copyright 1999-2013 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.2 2013/04/29 17:27:28 mr_bones_ Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.3 2013/04/29 17:32:59 mr_bones_ Exp $ |
| 30 |
|
| 31 |
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf} |
| 32 |
-SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/lib/syslog-ng} |
| 33 |
+SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng} |
| 34 |
SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist} |
| 35 |
SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/run} |
| 36 |
SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid} |
| 37 |
@@ -21,6 +21,8 @@ |
| 38 |
description="Syslog-ng is a syslog replacement with advanced filtering features." |
| 39 |
description_checkconfig="Check the configuration file that will be used by \"start\"" |
| 40 |
description_reload="Reload the configuration without exiting" |
| 41 |
+required_files="${SYSLOG_NG_CONFIGFILE}" |
| 42 |
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}" |
| 43 |
|
| 44 |
depend() { |
| 45 |
config "${SYSLOG_NG_CONFIGFILE}" |
| 46 |
@@ -31,12 +33,6 @@ |
| 47 |
} |
| 48 |
|
| 49 |
checkconfig() { |
| 50 |
- if [ ! -e "${SYSLOG_NG_CONFIGFILE}" ] ; then |
| 51 |
- eerror "You need to create ${SYSLOG_NG_CONFIGFILE} first." |
| 52 |
- eerror "An example can be found in /usr/share/doc/syslog-ng*" |
| 53 |
- |
| 54 |
- return 1 |
| 55 |
- fi |
| 56 |
ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})" |
| 57 |
syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}" |
| 58 |
eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})" |
Archives