diff options
| -rw-r--r-- | www-servers/lighttpd/ChangeLog | 7 | ||||
| -rw-r--r-- | www-servers/lighttpd/files/conf/mod_fastcgi.conf | 5 | ||||
| -rw-r--r-- | www-servers/lighttpd/files/lighttpd.initd | 48 |
3 files changed, 38 insertions, 22 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index c1362b99175f..4f7b5ecfe9a3 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/lighttpd # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.196 2009/04/03 18:58:12 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.197 2009/04/03 20:59:34 bangert Exp $ + + 03 Apr 2009; Thilo Bangert <bangert@gentoo.org> + files/conf/mod_fastcgi.conf, files/lighttpd.initd: + prepare for 1.4.22 - copy mod_fastcgi.conf-1.4.13-r2 to mod_fastcgi.conf + and lighttpd.initd-1.4.13-r2 to lighttpd.initd 03 Apr 2009; Thilo Bangert <bangert@gentoo.org> -files/1.4.16/03_all_lighttpd-1.4.11-errorlog-pipe.diff, diff --git a/www-servers/lighttpd/files/conf/mod_fastcgi.conf b/www-servers/lighttpd/files/conf/mod_fastcgi.conf index 452e1749e1f7..b70aff1d1f0d 100644 --- a/www-servers/lighttpd/files/conf/mod_fastcgi.conf +++ b/www-servers/lighttpd/files/conf/mod_fastcgi.conf @@ -1,15 +1,14 @@ ############################################################################### # mod_fastcgi.conf # include'd by lighttpd.conf. -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_fastcgi.conf,v 1.2 2005/08/27 12:36:13 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_fastcgi.conf,v 1.3 2009/04/03 20:59:34 bangert Exp $ ############################################################################### server.modules += ("mod_fastcgi") fastcgi.server = ( ".php" => ( "localhost" => ( - "host" => "127.0.0.1", - "port" => 1026, + "socket" => "/var/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket", "bin-path" => "/usr/bin/php-cgi" ) ) diff --git a/www-servers/lighttpd/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd index 1ce30659729d..71c72ba2ca8a 100644 --- a/www-servers/lighttpd/files/lighttpd.initd +++ b/www-servers/lighttpd/files/lighttpd.initd @@ -1,19 +1,19 @@ #!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2009 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.12 2007/10/12 20:54:46 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.13 2009/04/03 20:59:34 bangert Exp $ -opts="depend checkconfig start stop reload" +opts="reload graceful" depend() { need net - use mysql logger spawn-fcgi ldap slapd + use mysql logger spawn-fcgi ldap slapd netmount dns after famd after sshd } checkconfig() { - if [[ ! -f ${LIGHTTPD_CONF} ]] ; then + if [ ! -f "${LIGHTTPD_CONF}" ] ; then ewarn "${LIGHTTPD_CONF} does not exist." return 1 fi @@ -25,31 +25,43 @@ start() { checkconfig || return 1 ebegin "Starting lighttpd" - start-stop-daemon --start --quiet \ - --background --pidfile ${LIGHTTPD_PID} \ - --exec /usr/sbin/lighttpd -- -f ${LIGHTTPD_CONF} + start-stop-daemon --start --quiet --exec /usr/sbin/lighttpd \ + --pidfile "${LIGHTTPD_PID}" -- -f "${LIGHTTPD_CONF}" eend $? } stop() { local rv=0 ebegin "Stopping lighttpd" - if start-stop-daemon --stop --quiet --pidfile ${LIGHTTPD_PID} \ - --signal 2 ; then - rm -f ${LIGHTTPD_PID} - else - rv=1 - fi - eend $rv + start-stop-daemon --stop --quiet --pidfile "${LIGHTTPD_PID}" + eend $? } reload() { - if [ ! -f ${LIGHTTPD_PID} ]; then - eerror "lighttpd isn't running" + if ! service_started "${SVCNAME}" ; then + eerror "${SVCNAME} isn't running" return 1 fi checkconfig || return 1 + ebegin "Re-opening lighttpd log files" - kill -HUP `cat ${LIGHTTPD_PID}` &>/dev/null + start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \ + --signal HUP eend $? } + +graceful() { + if ! service_started "${SVCNAME}" ; then + eerror "${SVCNAME} isn't running" + return 1 + fi + checkconfig || return 1 + + ebegin "Gracefully stopping lighttpd" + start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \ + --signal INT + if eend $? ; then + rm -f "${LIGHTTPD_PID}" + start + fi +} |