r1950 - in branches/1.1: . bin/varnishadm bin/varnishd bin/varnishreplay debian
des at projects.linpro.no
des at projects.linpro.no
Wed Sep 12 18:05:55 CEST 2007
Author: des
Date: 2007-09-12 18:05:55 +0200 (Wed, 12 Sep 2007)
New Revision: 1950
Removed:
branches/1.1/debian/libvarnish-dev.dirs
branches/1.1/debian/libvarnish-dev.install
branches/1.1/debian/libvarnish.dirs
branches/1.1/debian/libvarnish.install
Modified:
branches/1.1/
branches/1.1/autogen.des
branches/1.1/bin/varnishadm/varnishadm.1
branches/1.1/bin/varnishd/varnishd.1
branches/1.1/bin/varnishreplay/varnishreplay.1
branches/1.1/debian/changelog
branches/1.1/debian/control
branches/1.1/debian/lintian-override
branches/1.1/debian/rules
branches/1.1/debian/varnish.default
branches/1.1/debian/varnish.postinst
branches/1.1/debian/varnish.varnishlog.init
Log:
Merged revisions 1935-1939,1941,1943-1949 via svnmerge from
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache
........
r1935 | ssm | 2007-09-04 12:55:25 +0200 (Tue, 04 Sep 2007) | 7 lines
* Set statedir to /var/lib, to conform to debian packaging standards.
* Removed -n switch from varnish defaults file and varnishlog init script.
Use the default instance name instead. This makes sure varnish utilities work
without having to use the -n switch for the default instance.
........
r1943 | des | 2007-09-12 10:37:42 +0200 (Wed, 12 Sep 2007) | 2 lines
Install man pages into the correct directory.
........
r1944 | ssm | 2007-09-12 15:19:27 +0200 (Wed, 12 Sep 2007) | 1 line
Bump debian version-revision to 1.1.2-1
........
r1945 | ssm | 2007-09-12 16:30:36 +0200 (Wed, 12 Sep 2007) | 4 lines
Debian package: Fix lintian warnings
* Add magic tag in varnish.postinst for debhelper
* Remove old overrides, add two overrides for update-rc.d
........
r1946 | ssm | 2007-09-12 16:31:22 +0200 (Wed, 12 Sep 2007) | 1 line
Debian package: Rename library and development packages to reflect soname
........
r1948 | ssm | 2007-09-12 17:21:12 +0200 (Wed, 12 Sep 2007) | 4 lines
Man page fixes
* Close list in varnishreplay.1
* Remove macro after Cm, as this cancelled the effect of Cm
........
r1949 | des | 2007-09-12 17:55:51 +0200 (Wed, 12 Sep 2007) | 2 lines
Additional markup fixes, bump date
........
Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859,1862,1865,1867-1868,1871,1873-1880,1896,1898,1902-1905,1907,1909,1913-1916,1920-1928
+ /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859,1862,1865,1867-1868,1871,1873-1880,1896,1898,1902-1905,1907,1909,1913-1916,1920-1928,1935-1939,1941,1943-1949
Modified: branches/1.1/autogen.des
===================================================================
--- branches/1.1/autogen.des 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/autogen.des 2007-09-12 16:05:55 UTC (rev 1950)
@@ -17,4 +17,5 @@
--enable-extra-developer-warnings \
--enable-stack-protector \
--enable-werror \
- --prefix=/opt/varnish
+ --prefix=/opt/varnish \
+ --mandir=/opt/varnish/man
Modified: branches/1.1/bin/varnishadm/varnishadm.1
===================================================================
--- branches/1.1/bin/varnishadm/varnishadm.1 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/bin/varnishadm/varnishadm.1 2007-09-12 16:05:55 UTC (rev 1950)
@@ -28,26 +28,26 @@
.\"
.\" $Id$
.\"
-.Dd August 19, 2007
+.Dd September 12, 2007
.Dt VARNISHADM 1
.Os
.Sh NAME
.Nm varnishadm
.Sh SYNOPSIS
.Nm
-.Fl T Ar address:port
-.Cm Ar command
+.Fl T Ar address Ns : Ns Ar port
+.Cm command
.Op Ar ...
.Sh DESCRIPTION
The
.Nm
utility sends the given command and arguments to the
.Xr varnishd 1
-instance at address:port and prints the results.
+instance at the specified address and port and prints the results.
.Pp
The following options are available:
.Bl -tag -width Fl
-.It Fl T Ar address:port
+.It Fl T Ar address Ns : Ns Ar port
Connect to the management interface at the specified address and port.
.El
.Sh EXIT STATUS
Modified: branches/1.1/bin/varnishd/varnishd.1
===================================================================
--- branches/1.1/bin/varnishd/varnishd.1 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/bin/varnishd/varnishd.1 2007-09-12 16:05:55 UTC (rev 1950)
@@ -36,7 +36,7 @@
.Nd HTTP accelerator daemon
.Sh SYNOPSIS
.Nm
-.Op Fl a Ar addrss Ns Op : Ns Ar port
+.Op Fl a Ar address Ns Op : Ns Ar port
.Op Fl b Ar host Ns Op : Ns Ar port
.Op Fl d
.Op Fl F
Modified: branches/1.1/bin/varnishreplay/varnishreplay.1
===================================================================
--- branches/1.1/bin/varnishreplay/varnishreplay.1 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/bin/varnishreplay/varnishreplay.1 2007-09-12 16:05:55 UTC (rev 1950)
@@ -27,7 +27,7 @@
.\"
.\" $Id$
.\"
-.Dd June 25, 2007
+.Dd September 12, 2007
.Dt VARNISHREPLAY 1
.Os
.Sh NAME
@@ -36,7 +36,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl D
-.Fl a Ar address:port
+.Fl a Ar address Ns : Ns Ar port
.Fl r Ar file
.Sh DESCRIPTION
The
@@ -45,7 +45,7 @@
.Pp
The following options are available:
.Bl -tag -width Fl
-.It Fl a Ar address:port
+.It Fl a Ar address Ns : Ns Ar port
Send the traffic over tcp to this address and port.
This option is mandatory.
.It Fl D
@@ -53,6 +53,7 @@
.It Fl r Ar file
Parse logs from this file.
This option is mandatory.
+.El
.Sh SEE ALSO
.Xr varnishd 1 ,
.Xr varnishlog 1
Modified: branches/1.1/debian/changelog
===================================================================
--- branches/1.1/debian/changelog 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/debian/changelog 2007-09-12 16:05:55 UTC (rev 1950)
@@ -1,14 +1,27 @@
-varnish (1.1.1) unstable; urgency=low
+varnish (1.1.2-1) unstable; urgency=low
* New upstream release
+ * Renamed library and development packages to reflect sonames
+
+ -- Stig Sandbeck Mathisen <ssm at fnord.no> Wed, 12 Sep 2007 16:05:22 +0200
+
+varnish (1.1.1-1) unstable; urgency=low
+
+ [Lars Bahner]
+ * New upstream release
* User and Group id added to default DAEMON_OPTS
* Added user and group creation to postinst
* Added missing man pages
- -- Lars Bahner <bahner at debian.org> Mon, 20 Aug 2007 11:29:33 +0200
+ [Stig Sandbeck Mathisen]
+ * Set statedir to /var/lib
+ * Removed -n switch from varnish defaults file and varnishlog init script.
+ Use the default instance name instead.
-varnish (1.1) unstable; urgency=low
+ -- Stig Sandbeck Mathisen <ssm at linpro.no> Tue, 04 Sep 2007 12:27:09 +0200
+varnish (1.1-1) unstable; urgency=low
+
* New upstream release
* Split package into varnish, libvarnish and libvarnish-dev
Modified: branches/1.1/debian/control
===================================================================
--- branches/1.1/debian/control 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/debian/control 2007-09-12 16:05:55 UTC (rev 1950)
@@ -8,7 +8,7 @@
Package: varnish
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gcc ( >= 3.3), libvarnish, libc6-dev | libc-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, gcc ( >= 3.3), libc6-dev | libc-dev, adduser
Description: A state-of-the-art, high-performance HTTP accelerator
varnish is the server-side alternative to Squid, written primarily with
speed in mind, and with a look to implementing full ESI-support in
@@ -21,26 +21,16 @@
will take full advantage of the advanced I/O features offered by these
operating systems.
-Package: libvarnish
+Package: libvarnish0
+Replaces: libvarnish
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Shared library for Varnish
- Shared library for Varnish.
- .
- Varnish is the server-side alternative to Squid, written primarily
- with speed in mind.
- .
- The goal of the Varnish project is to develop a state-of-the-art,
- high-performance HTTP accelerator.
+Description: Shared libraries for Varnish
+ Shared libraries for the Varnish HTTP accelerator.
-Package: libvarnish-dev
+Package: libvarnish0-dev
+Replaces: libvarnish-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libvarnish
+Depends: ${shlibs:Depends}, ${misc:Depends}, libvarnish0
Description: Shared library for Varnish
Development files for the Varnish library.
- .
- Varnish is the server-side alternative to Squid, written primarily
- with speed in mind.
- .
- The goal of the Varnish project is to develop a state-of-the-art,
- high-performance HTTP accelerator.
Deleted: branches/1.1/debian/libvarnish-dev.dirs
===================================================================
--- branches/1.1/debian/libvarnish-dev.dirs 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/debian/libvarnish-dev.dirs 2007-09-12 16:05:55 UTC (rev 1950)
@@ -1 +0,0 @@
-usr/lib
Deleted: branches/1.1/debian/libvarnish-dev.install
===================================================================
--- branches/1.1/debian/libvarnish-dev.install 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/debian/libvarnish-dev.install 2007-09-12 16:05:55 UTC (rev 1950)
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/*.a
-usr/lib/*.la
Deleted: branches/1.1/debian/libvarnish.dirs
===================================================================
--- branches/1.1/debian/libvarnish.dirs 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/debian/libvarnish.dirs 2007-09-12 16:05:55 UTC (rev 1950)
@@ -1 +0,0 @@
-usr/lib
Deleted: branches/1.1/debian/libvarnish.install
===================================================================
--- branches/1.1/debian/libvarnish.install 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/debian/libvarnish.install 2007-09-12 16:05:55 UTC (rev 1950)
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
Modified: branches/1.1/debian/lintian-override
===================================================================
--- branches/1.1/debian/lintian-override 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/debian/lintian-override 2007-09-12 16:05:55 UTC (rev 1950)
@@ -1,4 +1,3 @@
-varnish: non-dev-pkg-with-shlib-symlink usr/lib/libvarnish.so.0.0.0 usr/lib/libvarnish.so
-varnish: non-dev-pkg-with-shlib-symlink usr/lib/libvarnishapi.so.0.0.0 usr/lib/libvarnishapi.so
-varnish: non-dev-pkg-with-shlib-symlink usr/lib/libvcl.so.0.0.0 usr/lib/libvcl.so
-varnish: package-name-doesnt-match-sonames libvarnishapi0 libvcl0 libvarnish0
+varnish: duplicate-updaterc.d-calls-in-postinst varnish
+varnish: duplicate-updaterc.d-calls-in-postinst varnishlog
+
Modified: branches/1.1/debian/rules
===================================================================
--- branches/1.1/debian/rules 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/debian/rules 2007-09-12 16:05:55 UTC (rev 1950)
@@ -32,7 +32,7 @@
# The boilerplate linker flags won't allow varnish to compile :(
# There are circular dependencies in the varnish libraries, but
# the core developers have OK'ed that we don't check.
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" --localstatedir=/var
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" --localstatedir=/var/lib
build: build-stamp
Modified: branches/1.1/debian/varnish.default
===================================================================
--- branches/1.1/debian/varnish.default 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/debian/varnish.default 2007-09-12 16:05:55 UTC (rev 1950)
@@ -7,6 +7,10 @@
# Maximum number of open files (for ulimit -n)
NFILES=131072
+# Default varnish instance name is the local nodename. Can be overridden with
+# the -n switch, to have more instances on a single server.
+INSTANCE=$(uname -n)
+
# This file contains 4 alternatives, please use only one.
## Alternative 1, Minimal configuration, no VCL
@@ -18,8 +22,7 @@
-T localhost:6082 \
-b localhost:8080 \
-u varnish -g varnish \
- -n /var/lib/varnish \
- -s file,/var/lib/varnish/varnish_storage.bin,1G"
+ -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
## Alternative 2, Configuration with VCL
@@ -32,7 +35,7 @@
# -T localhost:6082 \
# -f /etc/varnish/default.vcl \
# -n /var/lib/varnish \
-# -s file,/var/lib/varnish/varnish_storage.bin,1G"
+# -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
## Alternative 3, Advanced configuration
@@ -65,7 +68,7 @@
# VARNISH_HOMEDIR=/var/lib/varnish
#
# # Cache file location
-# VARNISH_STORAGE_FILE=/var/lib/varnish/varnish_storage.bin
+# VARNISH_STORAGE_FILE=/var/lib/varnish/$INSTANCE/varnish_storage.bin
#
# # Cache file size: in bytes, optionally using k / M / G / T suffix,
# # or in percentage of available disk space using the % suffix.
@@ -84,7 +87,6 @@
# -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
# -t ${VARNISH_TTL} \
# -w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT} \
-# -n ${VARNISH_HOMEDIR} \
# -s ${VARNISH_STORAGE}"
#
Modified: branches/1.1/debian/varnish.postinst
===================================================================
--- branches/1.1/debian/varnish.postinst 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/debian/varnish.postinst 2007-09-12 16:05:55 UTC (rev 1950)
@@ -8,6 +8,7 @@
varnish_setup_user
+#DEBHELPER#
# Automatically added by dh_installinit
if [ -x "/etc/init.d/varnish" ]; then
update-rc.d varnish defaults >/dev/null
Modified: branches/1.1/debian/varnish.varnishlog.init
===================================================================
--- branches/1.1/debian/varnish.varnishlog.init 2007-09-12 15:55:51 UTC (rev 1949)
+++ branches/1.1/debian/varnish.varnishlog.init 2007-09-12 16:05:55 UTC (rev 1950)
@@ -24,7 +24,7 @@
test -x $DAEMON || exit 0
-DAEMON_OPTS="-a -n /var/lib/varnish -w ${LOGFILE} -D -P $PIDFILE"
+DAEMON_OPTS="-a -w ${LOGFILE} -D -P $PIDFILE"
case "$1" in
start)
More information about the varnish-commit
mailing list