r4421 - in trunk/varnish-cache: bin/varnishd man
tfheen at projects.linpro.no
tfheen at projects.linpro.no
Mon Jan 4 22:36:00 CET 2010
Author: tfheen
Date: 2010-01-04 22:36:00 +0100 (Mon, 04 Jan 2010)
New Revision: 4421
Modified:
trunk/varnish-cache/bin/varnishd/varnishd.1
trunk/varnish-cache/man/vcl.7so
Log:
Document server.identity and server.hostname (and -i to varnishd)
Fixes #602
Modified: trunk/varnish-cache/bin/varnishd/varnishd.1
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.1 2010-01-04 12:50:52 UTC (rev 4420)
+++ trunk/varnish-cache/bin/varnishd/varnishd.1 2010-01-04 21:36:00 UTC (rev 4421)
@@ -43,6 +43,7 @@
.Op Fl f Ar config
.Op Fl g Ar group
.Op Fl h Ar type Ns Op , Ns Ar options
+.Op Fl i Ar identity
.Op Fl l Ar shmlogsize
.Op Fl n Ar name
.Op Fl P Ar file
@@ -138,6 +139,11 @@
See
.Sx Hash Algorithms
for a list of supported algorithms.
+.It Fl i Ar identity
+Specify the identity of the varnish server. This can be accessed
+using
+.Va server.identity
+from VCL
.It Fl l Ar shmlogsize
Specify size of shmlog file.
Scaling suffixes like 'k', 'm' can be used up to (e)tabytes.
Modified: trunk/varnish-cache/man/vcl.7so
===================================================================
--- trunk/varnish-cache/man/vcl.7so 2010-01-04 12:50:52 UTC (rev 4420)
+++ trunk/varnish-cache/man/vcl.7so 2010-01-04 21:36:00 UTC (rev 4421)
@@ -489,6 +489,20 @@
.Bl -tag -width 4n
.It Va client.ip
The client's IP address.
+.It Va server.hostname
+The host name of the server.
+.It Va server.identity
+The identity of the server, as set by the
+.Fl i
+parameter.
+If the
+.Fl i
+parameter is not passed to
+.Nm varnishd ,
+.Va server.identity
+will be set to the name of the instance, as specified by the
+.Fl n
+parameter.
.It Va server.ip
The IP address of the socket on which the client connection was
received.
More information about the varnish-commit
mailing list