Changes - j0ke.net Open Build Service

Changes of Revision 3

[-] [+]	Changed	varnish.spec
@@ -19,7 +19,7 @@ Source: http://downloads.sourceforge.net/varnish/varnish-%{pversion}.tar.gz Source2: varnish.init Source3: varnish.sysconfig - +Patch0: varnish-redhat-pid.patch Summary: Varnish is a high-performance HTTP accelerator. %description @@ -88,7 +88,7 @@ %debug_package %prep %setup -n %{name}-%{pversion} -#%patch +%patch0 #sed -e ' s/8080/80/g ' etc/vcl.conf > redhat/vcl.conf touch AUTHORS COPYING NEWS @@ -138,6 +138,7 @@ # directorys %{__install} -m 0755 -d %{buildroot}%{pkg_cachedir} %endif +%{__install} -D -m 0755 %{buildroot}%{_var}/run/%{name} %clean %{__rm} -rf %{buildroot} @@ -173,6 +174,7 @@ %dir %attr(750,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{name}/ %config(noreplace) %attr(640,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{name}/default.vcl %config %attr(640,%{pkg_name},%{pkg_name}) %{_sysconfdir}/%{name}/default.vcl.example +%dir %attr(750,%{pkg_name},%{pkg_name}) %{_var}/run/%{name}/ # %{_sbindir}/varnishd %{_sbindir}/varnishhist
[-] [+]	Added	varnish-redhat-pid.patch ^
@@ -0,0 +1,42 @@ +--- varnish.initrc.orig 2008-10-14 19:19:10.000000000 +0200 ++++ varnish.initrc 2008-10-14 19:25:13.000000000 +0200 +@@ -6,7 +6,7 @@ + # description: Varnish is a high-perfomance HTTP accelerator + # processname: varnishd + # config: /etc/sysconfig/varnish +-# pidfile: /var/run/varnish/varnishd.pid ++# pidfile: /var/run/varnish/varnish.pid + + ### BEGIN INIT INFO + # Provides: varnish +@@ -21,7 +21,7 @@ + . /etc/init.d/functions + + retval=0 +-pidfile=/var/run/varnish.pid ++pidfile=/var/run/varnish/varnish.pid + + exec="/usr/sbin/varnishd" + prog="varnishd" +--- varnishlog.initrc.orig 2008-10-14 19:24:08.000000000 +0200 ++++ varnishlog.initrc 2008-10-14 19:24:39.000000000 +0200 +@@ -20,7 +20,7 @@ + . /etc/init.d/functions + + retval=0 +-pidfile="/var/run/varnishlog.pid" ++pidfile="/var/run/varnish/varnishlog.pid" + lockfile="/var/lock/subsys/varnishlog" + logfile="/var/log/varnish/varnish.log" + +--- varnishncsa.initrc.orig 2008-10-14 19:24:13.000000000 +0200 ++++ varnishncsa.initrc 2008-10-14 19:24:53.000000000 +0200 +@@ -20,7 +20,7 @@ + . /etc/init.d/functions + + retval=0 +-pidfile="/var/run/varnishncsa.pid" ++pidfile="/var/run/varnish/varnishncsa.pid" + lockfile="/var/lock/subsys/varnishncsa" + logfile="/var/log/varnish/varnishncsa.log" +
[-] [+]	Changed	varnish.init ^
@@ -207,7 +207,7 @@ echo -n "Reload service varnish " ## if it supports it: /sbin/killproc -HUP $VARNISH_BIN - #touch /var/run/varnish.pid + #touch /var/run/varnish/varnish.pid rc_status -v ## Otherwise: @@ -252,7 +252,7 @@ ## argument to this init script which is required for a reload. ## Note: probe is not (yet) part of LSB (as of 1.9) - test /etc/sysconfig/varnish -nt /var/run/varnish.pid && test -f /etc/varnish/default.vcl.net -nt /var/run/varnish.pid && echo reload + test /etc/sysconfig/varnish -nt /var/run/varnish/varnish.pid && test -f /etc/varnish/default.vcl.net -nt /var/run/varnish/varnish.pid && echo reload ;; *) echo "Usage: $0 {start\|stop\|status\|try-restart\|restart\|force-reload\|reload\|probe}"