[gentoo-commits] gentoo-x86 commit in www-servers/varnish/files: varnishd.confd varnishd.initd varnishd.logrotate

[gentoo-commits] gentoo-x86 commit in www-servers/varnish/files: varnishd.confd varnishd.initd varnishd.logrotate

[Thilo Bangert (bangert)]

bangert     09/07/12 12:04:06

  Modified:             varnishd.confd varnishd.initd
  Added:                varnishd.logrotate
  Log:
  implement logging (bug #270597) - thanks Joshua Bronson and Tim Taubert
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.2                  www-servers/varnish/files/varnishd.confd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/varnish/files/varnishd.confd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/varnish/files/varnishd.confd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/varnish/files/varnishd.confd?r1=1.1&r2=1.2

Index: varnishd.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.confd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- varnishd.confd	19 Oct 2006 07:46:53 -0000	1.1
+++ varnishd.confd	12 Jul 2009 12:04:06 -0000	1.2
@@ -4,3 +4,6 @@
 # please see the varnishd man page for more options
 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"



1.6                  www-servers/varnish/files/varnishd.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/varnish/files/varnishd.initd?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/varnish/files/varnishd.initd?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/varnish/files/varnishd.initd?r1=1.5&r2=1.6

Index: varnishd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- varnishd.initd	10 Mar 2008 22:10:20 -0000	1.5
+++ varnishd.initd	12 Jul 2009 12:04:06 -0000	1.6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 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.5 2008/03/10 22:10:20 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v 1.6 2009/07/12 12:04:06 bangert Exp $
 
 depend() {
 	need net
@@ -13,10 +13,16 @@
 	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 $?
+	ebegin "Starting varnish logging"
+	start-stop-daemon --quiet --start --pidfile /var/run/varnishncsa.pid --exec /usr/bin/varnishncsa -- -D -P /var/run/varnishncsa.pid ${VARNISHNCSA_ARGS}
+	eend $?
 }
 
 stop() {
 	ebegin "Stopping varnish"
 	start-stop-daemon --quiet --stop --pidfile /var/run/varnishd.pid
 	eend $?
+	ebegin "Stopping varnish logging"
+	start-stop-daemon --quiet --stop --pidfile /var/run/varnishncsa.pid
+	eend $?
 }



1.1                  www-servers/varnish/files/varnishd.logrotate

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/varnish/files/varnishd.logrotate?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/varnish/files/varnishd.logrotate?rev=1.1&content-type=text/plain

Index: varnishd.logrotate
===================================================================
/var/log/varnish/*.log {
  weekly
  rotate 10
  copytruncate
  delaycompress
  compress
  notifempty
  missingok
}