r5515 - trunk/varnish-cache/redhat

[ingvar at varnish-cache.org]

Author: ingvar
Date: 2010-11-04 14:11:45 +0100 (Thu, 04 Nov 2010)
New Revision: 5515

Modified:
   trunk/varnish-cache/redhat/varnish.initrc
   trunk/varnish-cache/redhat/varnish.spec
   trunk/varnish-cache/redhat/varnish_reload_vcl
Log:
varnish_reload_vcl should be home in /usr/bin

Modified: trunk/varnish-cache/redhat/varnish.initrc
===================================================================
--- trunk/varnish-cache/redhat/varnish.initrc	2010-11-04 12:44:50 UTC (rev 5514)
+++ trunk/varnish-cache/redhat/varnish.initrc	2010-11-04 13:11:45 UTC (rev 5515)
@@ -26,7 +26,7 @@
 pidfile=/var/run/varnish.pid
 
 exec="/usr/sbin/varnishd"
-reload_exec="/usr/sbin/varnish_reload_vcl"
+reload_exec="/usr/bin/varnish_reload_vcl"
 prog="varnishd"
 config="/etc/sysconfig/varnish"
 lockfile="/var/lock/subsys/varnish"

Modified: trunk/varnish-cache/redhat/varnish.spec
===================================================================
--- trunk/varnish-cache/redhat/varnish.spec	2010-11-04 12:44:50 UTC (rev 5514)
+++ trunk/varnish-cache/redhat/varnish.spec	2010-11-04 13:11:45 UTC (rev 5515)
@@ -180,7 +180,7 @@
 %{__install} -D -m 0755 redhat/varnish.initrc %{buildroot}%{_initrddir}/varnish
 %{__install} -D -m 0755 redhat/varnishlog.initrc %{buildroot}%{_initrddir}/varnishlog
 %{__install} -D -m 0755 redhat/varnishncsa.initrc %{buildroot}%{_initrddir}/varnishncsa
-%{__install} -D -m 0755 redhat/varnish_reload_vcl %{buildroot}%{_sbindir}/varnish_reload_vcl
+%{__install} -D -m 0755 redhat/varnish_reload_vcl %{buildroot}%{_bindir}/varnish_reload_vcl
 
 %clean
 rm -rf %{buildroot}

Modified: trunk/varnish-cache/redhat/varnish_reload_vcl
===================================================================
--- trunk/varnish-cache/redhat/varnish_reload_vcl	2010-11-04 12:44:50 UTC (rev 5514)
+++ trunk/varnish-cache/redhat/varnish_reload_vcl	2010-11-04 13:11:45 UTC (rev 5515)
@@ -34,7 +34,6 @@
 }
 
 # Read configuration
-exec="/usr/sbin/varnishd"
 . /etc/sysconfig/varnish
 
 $debug && print_debug