diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2013-03-14 12:18:17 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2013-03-14 12:18:17 +0000 |
| commit | 170cbc498f604db59c6753085411ba6a7704c2a4 (patch) | |
| tree | dddcb0457196c0a54bd692f41c0f160fb9c42e7f /www-servers | |
| parent | Version bump (hardmasked) (diff) | |
| download | gentoo-2-170cbc498f604db59c6753085411ba6a7704c2a4.tar.gz gentoo-2-170cbc498f604db59c6753085411ba6a7704c2a4.tar.bz2 gentoo-2-170cbc498f604db59c6753085411ba6a7704c2a4.zip | |
Increase number of open files, bug #459142
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/varnish/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/varnish/files/varnishd.confd | 5 | ||||
| -rwxr-xr-x | www-servers/varnish/files/varnishd.initd | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog index 389c13ea6cf3..32542eb0d059 100644 --- a/www-servers/varnish/ChangeLog +++ b/www-servers/varnish/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/varnish -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.53 2012/11/22 20:54:53 blueness Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.54 2013/03/14 12:18:17 blueness Exp $ + + 14 Mar 2013; Anthony G. Basile <blueness@gentoo.org> files/varnishd.confd, + files/varnishd.initd: + Increase number of open files, bug #459142 22 Nov 2012; Anthony G. Basile <blueness@gentoo.org> +files/varnish-3.0.3-pthread-uclibc.patch, varnish-3.0.3.ebuild: diff --git a/www-servers/varnish/files/varnishd.confd b/www-servers/varnish/files/varnishd.confd index c2eb140db768..a0d49ac5b366 100644 --- a/www-servers/varnish/files/varnishd.confd +++ b/www-servers/varnish/files/varnishd.confd @@ -7,3 +7,8 @@ VARNISHD_OPTS="-a 127.0.0.1:8080 -b 127.0.0.1:80" # arguments passed to varnishncsa # please see the varnishncsa man page for more options VARNISHNCSA_ARGS="-c -a -w /var/log/varnish/access.log" + +# We need to increase the number of open files (-n) +# and the maximum amount off locked memory (-l) +# See bug #459142 +rc_ulimit="-n 32786 -l 82000" diff --git a/www-servers/varnish/files/varnishd.initd b/www-servers/varnish/files/varnishd.initd index f65cce7122f8..33f5d74b75bf 100755 --- a/www-servers/varnish/files/varnishd.initd +++ b/www-servers/varnish/files/varnishd.initd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v 1.7 2009/08/30 06:28:07 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v 1.8 2013/03/14 12:18:17 blueness Exp $ depend() { need net @@ -9,8 +9,6 @@ depend() { start() { ebegin "Starting varnish" - #allow varnishd to lock logfile to memory - ulimit -l 82000 start-stop-daemon --quiet --start --pidfile /var/run/varnishd.pid --exec /usr/sbin/varnishd -- -P /var/run/varnishd.pid ${VARNISHD_OPTS} &> /dev/null eend $? |