r1449 - trunk/varnish-cache/redhat

[ingvar at projects.linpro.no]

Author: ingvar
Date: 2007-05-17 23:49:45 +0200 (Thu, 17 May 2007)
New Revision: 1449

Modified:
   trunk/varnish-cache/redhat/varnish.spec
   trunk/varnish-cache/redhat/varnish.sysconfig
Log:
Our default.vcl has a minor change: It uses localhost:80 (thus not
default anymore, but whatever, it will work with apache httpd out of
the box, and that's better for easy testing) as the backend. sysconfig
file changed to reflect this.

Minor cosmetic changes in the specfile

Ingvar



Modified: trunk/varnish-cache/redhat/varnish.spec
===================================================================
--- trunk/varnish-cache/redhat/varnish.spec	2007-05-17 21:11:37 UTC (rev 1448)
+++ trunk/varnish-cache/redhat/varnish.spec	2007-05-17 21:49:45 UTC (rev 1449)
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 1.0.svn
-Release: 20070516%{?dist}
+Release: 20070517%{?dist}
 License: BSD-like
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -47,13 +47,15 @@
 %prep
 %setup -q
 
+# The svn sources needs to generate a suitable configure script
+# Release tarballs would not need this
 ./autogen.sh
 
 %build
 
 # Remove "--disable static" if you want to build static libraries 
 # (ie for the devel package)
-%configure --sbindir=/usr/sbin --disable-static
+%configure --disable-static
 
 # We have to remove rpath - not allowed in Fedora
 # (This problem only visible on 64 bit arches)
@@ -137,7 +139,7 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Wed May 16 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.svn-20070516
+* Wed May 16 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.svn-20070517
 - Wrapping up for 1.0.4
 - Changes in sysconfig and init scripts. Syncing with files in
   trunk/debian

Modified: trunk/varnish-cache/redhat/varnish.sysconfig
===================================================================
--- trunk/varnish-cache/redhat/varnish.sysconfig	2007-05-17 21:11:37 UTC (rev 1448)
+++ trunk/varnish-cache/redhat/varnish.sysconfig	2007-05-17 21:49:45 UTC (rev 1449)
@@ -14,10 +14,10 @@
 # Listen on port 6081, administration on localhost:6082, and forward to
 # content server on localhost:8080.  Use a fixed-size cache file.
 #
-DAEMON_OPTS="-a :6081 \
-             -T localhost:6082 \
-	     -b localhost:8080 \
-	     -s file,/var/lib/varnish/varnish_storage.bin,1G"
+#DAEMON_OPTS="-a :6081 \
+#             -T localhost:6082 \
+#             -b localhost:8080 \
+#             -s file,/var/lib/varnish/varnish_storage.bin,1G"
 
 
 ## Alternative 2, Configuration with VCL
@@ -26,10 +26,10 @@
 # one content server selected by the vcl file, based on the request.  Use a
 # fixed-size cache file.
 #
-# DAEMON_OPTS="-a :6081 \
-#              -T localhost:6082 \
-#              -f /etc/varnish/default.vcl \
-#              -s file,/var/lib/varnish/varnish_storage.bin,1G"
+DAEMON_OPTS="-a :6081 \
+             -T localhost:6082 \
+             -f /etc/varnish/default.vcl \
+             -s file,/var/lib/varnish/varnish_storage.bin,1G"
 
 
 ## Alternative 3, Advanced configuration