* [gentoo-commits] gentoo-x86 commit in app-admin/syslog-ng/files/3.4: syslog-ng.rc6
@ 2013-04-29 17:27 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 5+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2013-04-29 17:27 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 13/04/29 17:27:28
Modified: syslog-ng.rc6
Log:
depend() shouldn't talk to the user
(Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.2 app-admin/syslog-ng/files/3.4/syslog-ng.rc6
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?r1=1.1&r2=1.2
Index: syslog-ng.rc6
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- syslog-ng.rc6 28 Apr 2013 04:50:34 -0000 1.1
+++ syslog-ng.rc6 29 Apr 2013 17:27:28 -0000 1.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.1 2013/04/28 04:50:34 mr_bones_ Exp $
+# $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 $
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/lib/syslog-ng}
@@ -23,12 +23,6 @@
description_reload="Reload the configuration without exiting"
depend() {
- if [ ! -e "${SYSLOG_NG_CONFIGFILE}" ] ; then
- eerror "You need to create ${SYSLOG_NG_CONFIGFILE} first."
- eerror "An example can be found in /usr/share/doc/syslog"
-
- return 1
- fi
config "${SYSLOG_NG_CONFIGFILE}"
use clock
need hostname localmount
@@ -37,6 +31,12 @@
}
checkconfig() {
+ if [ ! -e "${SYSLOG_NG_CONFIGFILE}" ] ; then
+ eerror "You need to create ${SYSLOG_NG_CONFIGFILE} first."
+ eerror "An example can be found in /usr/share/doc/syslog-ng*"
+
+ return 1
+ fi
ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-admin/syslog-ng/files/3.4: syslog-ng.rc6
@ 2013-04-29 17:32 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 5+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2013-04-29 17:32 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 13/04/29 17:32:59
Modified: syslog-ng.rc6
Log:
use required_* runscript variables; STATEFILE_DIR typo
(Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.3 app-admin/syslog-ng/files/3.4/syslog-ng.rc6
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?rev=1.3&view=markup
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
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
Index: syslog-ng.rc6
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- syslog-ng.rc6 29 Apr 2013 17:27:28 -0000 1.2
+++ syslog-ng.rc6 29 Apr 2013 17:32:59 -0000 1.3
@@ -1,10 +1,10 @@
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
-SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/lib/syslog-ng}
+SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/run}
SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
@@ -21,6 +21,8 @@
description="Syslog-ng is a syslog replacement with advanced filtering features."
description_checkconfig="Check the configuration file that will be used by \"start\""
description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
depend() {
config "${SYSLOG_NG_CONFIGFILE}"
@@ -31,12 +33,6 @@
}
checkconfig() {
- if [ ! -e "${SYSLOG_NG_CONFIGFILE}" ] ; then
- eerror "You need to create ${SYSLOG_NG_CONFIGFILE} first."
- eerror "An example can be found in /usr/share/doc/syslog-ng*"
-
- return 1
- fi
ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-admin/syslog-ng/files/3.4: syslog-ng.rc6
@ 2013-04-29 17:39 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 5+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2013-04-29 17:39 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 13/04/29 17:39:26
Modified: syslog-ng.rc6
Log:
no need for config line in depend()
(Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.4 app-admin/syslog-ng/files/3.4/syslog-ng.rc6
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?r1=1.3&r2=1.4
Index: syslog-ng.rc6
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- syslog-ng.rc6 29 Apr 2013 17:32:59 -0000 1.3
+++ syslog-ng.rc6 29 Apr 2013 17:39:26 -0000 1.4
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.4 2013/04/29 17:39:26 mr_bones_ Exp $
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
@@ -25,7 +25,6 @@
required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
depend() {
- config "${SYSLOG_NG_CONFIGFILE}"
use clock
need hostname localmount
after bootmisc
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-admin/syslog-ng/files/3.4: syslog-ng.rc6
@ 2013-05-08 20:12 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 5+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2013-05-08 20:12 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 13/05/08 20:12:59
Modified: syslog-ng.rc6
Log:
correct mode on statefile directory (bug #469004)
(Portage version: 2.1.11.62/cvs/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
Revision Changes Path
1.5 app-admin/syslog-ng/files/3.4/syslog-ng.rc6
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?r1=1.4&r2=1.5
Index: syslog-ng.rc6
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- syslog-ng.rc6 29 Apr 2013 17:39:26 -0000 1.4
+++ syslog-ng.rc6 8 May 2013 20:12:59 -0000 1.5
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.4 2013/04/29 17:39:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.5 2013/05/08 20:12:59 mr_bones_ Exp $
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
@@ -41,7 +41,7 @@
checkconfig || return 1
checkpath \
-d \
- --mode 0600 \
+ --mode 0700 \
--owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \
"${SYSLOG_NG_STATEFILE_DIR}"
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-admin/syslog-ng/files/3.4: syslog-ng.rc6
@ 2013-08-31 17:44 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 5+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2013-08-31 17:44 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 13/08/31 17:44:03
Modified: syslog-ng.rc6
Log:
set full path to syslog-ng for bug #483142
(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.6 app-admin/syslog-ng/files/3.4/syslog-ng.rc6
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6?r1=1.5&r2=1.6
Index: syslog-ng.rc6
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- syslog-ng.rc6 8 May 2013 20:12:59 -0000 1.5
+++ syslog-ng.rc6 31 Aug 2013 17:44:03 -0000 1.6
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.5 2013/05/08 20:12:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.6 2013/08/31 17:44:03 mr_bones_ Exp $
SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
@@ -12,7 +12,7 @@
SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
-command="syslog-ng"
+command="/usr/sbin/syslog-ng"
command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
extra_commands="checkconfig"
extra_started_commands="reload"
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-08-31 17:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-08 20:12 [gentoo-commits] gentoo-x86 commit in app-admin/syslog-ng/files/3.4: syslog-ng.rc6 Michael Sterrett (mr_bones_)
-- strict thread matches above, loose matches on Subject: below --
2013-08-31 17:44 Michael Sterrett (mr_bones_)
2013-04-29 17:39 Michael Sterrett (mr_bones_)
2013-04-29 17:32 Michael Sterrett (mr_bones_)
2013-04-29 17:27 Michael Sterrett (mr_bones_)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox