add reload() to init script - use it in the logrotate script bug 125241 - thanks david somers

(Portage version: 2.0.54-r2)

4 files changed, 25 insertions, 9 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 9e0a85065bdb..8b2372a9b574 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.70 2006/05/30 18:11:57 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.71 2006/05/30 19:49:29 bangert Exp $
+
+  30 May 2006; Thilo Bangert <bangert@gentoo.org> files/lighttpd.initd,
+  files/lighttpd.logrotate:
+  add reload() to init script - use it in the logrotate script
+  bug 125241 - thanks david somers
 
 *lighttpd-1.4.11 (30 May 2006)
 
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 08592f088fbc..1c579800996f 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,4 +1,4 @@
-MD5 0163e61766e73a6aed70ede9713a8951 ChangeLog 20603
+MD5 af892c7141c0decbba2a19d9da7f3957 ChangeLog 20802
 MD5 24669453e8f69faf4212dfa43e90e3dd files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff 517
 MD5 8c00894c801011ca682400a243aa49cb files/1.4.10/02_all_r991_posix_fadvise.diff 805
 MD5 f9b6a2f0c377777945de48d3e7bdda40 files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff 638
@@ -38,8 +38,8 @@ MD5 44374d14af9b69b8f60f8d73f14c848d files/lighttpd-1.3.13-pam-name.diff 564
 MD5 f111e60bb593bffbdb01b9aece46ab20 files/lighttpd-1.3.13-php.diff 1399
 MD5 9cc5ffbffdd7554797c338c5972ed813 files/lighttpd-1.3.13-valid-user.diff 762
 MD5 5eb378dcd8905a09175df3e48953100c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970
-MD5 f7a395058ddefb2432637f782db0f9fe files/lighttpd.initd 1006
-MD5 210f81ad7867965b19993d0a4d8d54e7 files/lighttpd.logrotate 488
+MD5 8470c242445cf2480c2116be10b9b17f files/lighttpd.initd 1225
+MD5 4315fc35e158dfcca5ef0962988cb027 files/lighttpd.logrotate 487
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
 MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
 MD5 f18029dea31126d04d7287f80610b2ca lighttpd-1.3.13-r3.ebuild 2649
diff --git a/www-servers/lighttpd/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd
index 88fc0d6827b9..81420e4460ac 100644
--- a/www-servers/lighttpd/files/lighttpd.initd
+++ b/www-servers/lighttpd/files/lighttpd.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.7 2005/10/12 12:51:22 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.8 2006/05/30 19:49:29 bangert Exp $
 
-opts="depend checkconfig start stop"
+opts="depend checkconfig start stop reload"
 
 LIGHTTPD_CONF="/etc/lighttpd/lighttpd.conf"
 LIGHTTPD_PID="/var/run/lighttpd.pid"
@@ -38,9 +38,20 @@ stop() {
 	ebegin "Stopping lighttpd"
 	if start-stop-daemon --stop --quiet --pidfile ${LIGHTTPD_PID} \
 			--signal 2 ; then
-		rm -f /var/run/lighttpd.pid
+		rm -f ${LIGHTTPD_PID} 
 	else
 		rv=1
 	fi
 	eend $rv
 }
+
+reload() {
+	if [ ! -f ${LIGHTTPD_PID} ]; then
+		eerror "lighttpd isn't running"
+		return 1
+	fi
+	checkconfig || return 1
+	ebegin "Re-opening lighttpd log files"
+	kill -HUP `cat ${LIGHTTPD_PID}` &>/dev/null
+	eend $?
+}
diff --git a/www-servers/lighttpd/files/lighttpd.logrotate b/www-servers/lighttpd/files/lighttpd.logrotate
index 4646dad39b94..76f0ef3ff584 100644
--- a/www-servers/lighttpd/files/lighttpd.logrotate
+++ b/www-servers/lighttpd/files/lighttpd.logrotate
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.logrotate,v 1.1 2005/08/22 16:01:18 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.logrotate,v 1.2 2006/05/30 19:49:29 bangert Exp $
 # lighttpd logrotate script for Gentoo
 
 /var/log/lighttpd/*.log {
@@ -11,7 +11,7 @@
         sharedscripts
         postrotate
            if [ -f /var/run/lighttpd.pid ]; then \
-                /etc/init.d/lighttpd restart > /dev/null 2>&1 || true ; \
+                /etc/init.d/lighttpd reload > /dev/null 2>&1 || true ; \
            fi;
         endscript
 }