diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2004-08-05 01:05:13 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2004-08-05 01:05:13 +0000 |
| commit | 726c6cf7eecc77e833ef46dee6ff37006026c009 (patch) | |
| tree | 3d2c6ad96ab6cccc866f631a436edd11671ac5e2 /app-admin/syslog-ng | |
| parent | claims of a newer libxml2 needed... (diff) | |
| download | historical-726c6cf7eecc77e833ef46dee6ff37006026c009.tar.gz historical-726c6cf7eecc77e833ef46dee6ff37006026c009.tar.bz2 historical-726c6cf7eecc77e833ef46dee6ff37006026c009.zip | |
checkconfig before reload to catch mis-config earlier. Patch from Eldad Zack via bug #58216
Diffstat (limited to 'app-admin/syslog-ng')
| -rw-r--r-- | app-admin/syslog-ng/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/syslog-ng/Manifest | 18 | ||||
| -rw-r--r-- | app-admin/syslog-ng/files/syslog-ng.rc6 | 5 |
3 files changed, 13 insertions, 16 deletions
diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog index 75141662454b..1aa6d2086de0 100644 --- a/app-admin/syslog-ng/ChangeLog +++ b/app-admin/syslog-ng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/syslog-ng # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.60 2004/07/05 07:25:02 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.61 2004/08/05 01:05:13 mr_bones_ Exp $ + + 04 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> files/syslog-ng.rc6: + checkconfig before reload to catch mis-config earlier. Patch from Eldad + Zack via bug #58216 05 Jul 2004; Joshua Kinard <kumba@gentoo.org> syslog-ng-1.6.4.ebuild: Marked stable on mips. diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 7d72c37ea9bc..627bde1100c0 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -1,22 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 32dbf2382a38707ee68dcdf2502f9dd4 ChangeLog 9502 -MD5 06a2fa1e0308f065f818db6fae959fe9 metadata.xml 257 +MD5 370e4488c70f345a6ab45e82c0293a0f ChangeLog 9680 MD5 7899a4974274c1d4468d4ea8cd18625e syslog-ng-1.6.4.ebuild 1613 -MD5 1e59718f4b92bd26d38b9fd9834734a9 syslog-ng-1.6.0_rc3-r1.ebuild 2087 MD5 589e3519209fd75963d4de420dfa7b78 syslog-ng-1.6.2.ebuild 1766 +MD5 1e59718f4b92bd26d38b9fd9834734a9 syslog-ng-1.6.0_rc3-r1.ebuild 2087 +MD5 06a2fa1e0308f065f818db6fae959fe9 metadata.xml 257 MD5 d55e983790598d0428f0a439bd098d09 files/digest-syslog-ng-1.6.4 67 +MD5 905946412f858f18a7991d93569a8619 files/syslog-ng.rc6 1491 MD5 2f74ad6ee4a5100535a90c156a866ecd files/digest-syslog-ng-1.6.0_rc3-r1 70 MD5 ec03b691f321f282bc875862b147922c files/syslog-ng.conf.gentoo 1068 MD5 f0f2cd6e0951bc82d74c7f92c4e3b417 files/syslog-ng.conf.sample 3735 MD5 fe66a527c7f36a560197b4187ad6d9db files/syslog-ng.logrotate 342 -MD5 22b506926ae9ce7732b34eadae8c525e files/syslog-ng.rc6 1330 MD5 b48d452f2ef894e02ff2b247086944d6 files/digest-syslog-ng-1.6.2 67 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.4 (GNU/Linux) - -iD8DBQFA+eFCmdTrptrqvGERApjpAJ4/DEuMzxejcJ0wvXgc/537/m2BWgCZASsx -4ZvkoL+bxc6uQLzRMcKgtUc= -=PMjv ------END PGP SIGNATURE----- diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6 b/app-admin/syslog-ng/files/syslog-ng.rc6 index 3e0960479533..608dfc6f52bc 100644 --- a/app-admin/syslog-ng/files/syslog-ng.rc6 +++ b/app-admin/syslog-ng/files/syslog-ng.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6,v 1.13 2004/07/14 21:20:06 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6,v 1.14 2004/08/05 01:05:13 mr_bones_ Exp $ opts="depend checkconfig start stop reload" @@ -20,6 +20,8 @@ checkconfig() { eerror "An example can be found in /etc/syslog-ng/syslog-ng.conf.sample" return 1 fi + syslog-ng -s /etc/syslog-ng/syslog-ng.conf + eend $? "Configuration error. Please fix your configfile (/etc/syslog-ng/syslog-ng.conf)" } start() { @@ -41,6 +43,7 @@ reload() { eerror "syslog-ng isn't running" return 1 fi + checkconfig || return 1 ebegin "Reloading configuration and re-opening log files" kill -HUP `cat /var/run/syslog-ng.pid` &>/dev/null eend $? |