Commit 0f66e81e authored by Lasse Karstensen's avatar Lasse Karstensen

Reformatting tab/space and width.

Also removed one last meta-header forgotten on the last commit.
parent 76338608
...@@ -29,22 +29,23 @@ OPTIONS ...@@ -29,22 +29,23 @@ OPTIONS
======= =======
-t timeout -t timeout
Wait no longer than this many seconds for an operation to finish. Wait no longer than this many seconds for an operation to finish.
-S secret_file -S secret_file
Specify the authentication secret file. This should be the same -S Specify the authentication secret file. This should be the same -S
argument as was given to varnishd. Only processes which can read argument as was given to varnishd. Only processes which can read
the contents of this file, will be able to authenticate the CLI connection. the contents of this file, will be able to authenticate the CLI connection.
-T address:port
Connect to the management interface at the specified address and port.
-n name -n name
Connect to the instance of varnishd with this name. Connect to the instance of varnishd with this name.
-T address:port
Connect to the management interface at the specified address and port.
The syntax and operation of the actual CLI interface is described in The syntax and operation of the actual CLI interface is described in
the varnish-cli(7) manual page. Parameteres are described in the varnish-cli(7) manual page. Parameteres are described in
varnishd(1) manual page. varnishd(1) manual page.
Additionally, a summary of commands can be obtained by issuing the Additionally, a summary of commands can be obtained by issuing the
*help* command, and a summary of parameters can be obtained by issuing *help* command, and a summary of parameters can be obtained by issuing
...@@ -61,9 +62,9 @@ EXAMPLES ...@@ -61,9 +62,9 @@ EXAMPLES
Some ways you can use varnishadm:: Some ways you can use varnishadm::
varnishadm -T localhost:999 -S /var/db/secret vcl.use foo varnishadm -T localhost:999 -S /var/db/secret vcl.use foo
echo vcl.use foo | varnishadm -T localhost:999 -S /var/db/secret echo vcl.use foo | varnishadm -T localhost:999 -S /var/db/secret
echo vcl.use foo | ssh vhost varnishadm -T localhost:999 -S /var/db/secret echo vcl.use foo | ssh vhost varnishadm -T localhost:999 -S /var/db/secret
SEE ALSO SEE ALSO
======== ========
...@@ -74,7 +75,7 @@ HISTORY ...@@ -74,7 +75,7 @@ HISTORY
======= =======
The varnishadm utility and this manual page were written by Cecilie The varnishadm utility and this manual page were written by Cecilie
Fritzvold. Converted to reStructured and updated in 2010 by Per Fritzvold. Converted to reStructuredText and updated in 2010 by Per
Buer. Buer.
COPYRIGHT COPYRIGHT
......
...@@ -30,7 +30,7 @@ OPTIONS ...@@ -30,7 +30,7 @@ OPTIONS
======= =======
-a address[:port][,address[:port][...] -a address[:port][,address[:port][...]
Listen for client requests on the specified address and port. The address can be a host Listen for client requests on the specified address and port. The address can be a host
name (“localhost”), an IPv4 dotted-quad (“127.0.0.1”), or an IPv6 address enclosed in name (“localhost”), an IPv4 dotted-quad (“127.0.0.1”), or an IPv6 address enclosed in
square brackets (“[::1]”). If address is not specified, varnishd will listen on all square brackets (“[::1]”). If address is not specified, varnishd will listen on all
available IPv4 and IPv6 interfaces. If port is not specified, the default HTTP port as available IPv4 and IPv6 interfaces. If port is not specified, the default HTTP port as
...@@ -39,10 +39,10 @@ OPTIONS ...@@ -39,10 +39,10 @@ OPTIONS
-b host[:port] -b host[:port]
Use the specified host as backend server. If port is not specified, Use the specified host as backend server. If port is not specified,
the default is 8080. the default is 8080.
-C Print VCL code compiled to C language and exit. Specify the VCL file -C Print VCL code compiled to C language and exit. Specify the VCL file
to compile with the -f option. to compile with the -f option.
-d Enables debugging mode: The parent process runs in the foreground with a CLI connection -d Enables debugging mode: The parent process runs in the foreground with a CLI connection
on stdin/stdout, and the child process must be started explicitly with a CLI command. on stdin/stdout, and the child process must be started explicitly with a CLI command.
...@@ -78,9 +78,9 @@ OPTIONS ...@@ -78,9 +78,9 @@ OPTIONS
-P file Write the process's PID to the specified file. -P file Write the process's PID to the specified file.
-p param=value -p param=value
Set the parameter specified by param to the specified value. See Run-Time Set the parameter specified by param to the specified value. See
Parameters for a list of parameters. This option can be used multiple Run-Time Parameters for a list of parameters. This option can be
times to specify multiple parameters. used multiple times to specify multiple parameters.
-S file Path to a file containing a secret used for authorizing access to the management port. -S file Path to a file containing a secret used for authorizing access to the management port.
...@@ -100,15 +100,13 @@ OPTIONS ...@@ -100,15 +100,13 @@ OPTIONS
Interface for a list of management commands. Interface for a list of management commands.
-M address:port -M address:port
Connect to this port and offer the command line Connect to this port and offer the command line interface.
interface. Think of it as a reverse shell. When running with Think of it as a reverse shell. When running with -M and there is
-M and there is no backend defined the child process (the cache) no backend defined the child process (the cache) will not start
will not start initially. initially.
-t ttl -t ttl Specifies a hard minimum time to live for cached documents. This
Specifies a hard minimum time to live for cached is a shortcut for specifying the default_ttl run-time parameter.
documents. This is a shortcut for specifying the
default_ttl run-time parameter.
-r param[,param...] -r param[,param...]
Make the listed parameters read only. This gives the Make the listed parameters read only. This gives the
...@@ -120,8 +118,8 @@ OPTIONS ...@@ -120,8 +118,8 @@ OPTIONS
-u user Specifies the name of an unprivileged user to which the child -u user Specifies the name of an unprivileged user to which the child
process should switch before it starts accepting process should switch before it starts accepting
connections. This is a shortcut for specifying the user connections. This is a shortcut for specifying the user
run- time parameter. runtime parameter.
If specifying both a user and a group, the user should be If specifying both a user and a group, the user should be
specified first. specified first.
...@@ -135,19 +133,19 @@ Hash Algorithms ...@@ -135,19 +133,19 @@ Hash Algorithms
The following hash algorithms are available: The following hash algorithms are available:
simple_list simple_list
A simple doubly-linked list. Not recommended for production use. A simple doubly-linked list. Not recommended for production use.
classic[,buckets] classic[,buckets]
A standard hash table. This is the default. The hash key is the A standard hash table. This is the default. The hash key is the
CRC32 of the object's URL modulo the size of the hash table. Each CRC32 of the object's URL modulo the size of the hash table. Each
table entry points to a list of elements which share the same hash table entry points to a list of elements which share the same hash
key. The buckets parameter specifies the number of entries in the key. The buckets parameter specifies the number of entries in the
hash table. The default is 16383. hash table. The default is 16383.
critbit critbit
A self-scaling tree structure. The default hash algorithm in 2.1. In A self-scaling tree structure. The default hash algorithm in 2.1. In
comparison to a more traditional B tree the critbit tree is almost comparison to a more traditional B tree the critbit tree is almost
completely lockless. completely lockless.
Storage Types Storage Types
------------- -------------
...@@ -243,7 +241,7 @@ The varnishd daemon was developed by Poul-Henning Kamp in cooperation ...@@ -243,7 +241,7 @@ The varnishd daemon was developed by Poul-Henning Kamp in cooperation
with Verdens Gang AS, Varnish Software AS and Varnish Software. with Verdens Gang AS, Varnish Software AS and Varnish Software.
This manual page was written by Dag-Erling Smørgrav with updates by This manual page was written by Dag-Erling Smørgrav with updates by
Stig Sandbeck Mathisen <ssm@debian.org> Stig Sandbeck Mathisen <ssm@debian.org>.
COPYRIGHT COPYRIGHT
......
...@@ -76,6 +76,7 @@ The varnishsizes utility was developed by Kristian Lyngstøl based on ...@@ -76,6 +76,7 @@ The varnishsizes utility was developed by Kristian Lyngstøl based on
varnishhist. This manual page was written by Kristian Lyngstøl, varnishhist. This manual page was written by Kristian Lyngstøl,
Dag-Erling Smørgrav and Per Buer. Dag-Erling Smørgrav and Per Buer.
COPYRIGHT COPYRIGHT
========= =========
......
...@@ -126,6 +126,7 @@ This manual page was originally written by Stig Sandbeck Mathisen ...@@ -126,6 +126,7 @@ This manual page was originally written by Stig Sandbeck Mathisen
<ssm@linpro.no> and updated by Kristian Lyngstøl <ssm@linpro.no> and updated by Kristian Lyngstøl
<kristian@varnish-cache.org>. <kristian@varnish-cache.org>.
COPYRIGHT COPYRIGHT
========= =========
......
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
Varnish VSL Query Expressions Varnish VSL Query Expressions
============================= =============================
:Author: Martin Blix Grydeland
:Date: 2013-09-26
:Version: 0.1
:Manual section: 7
OVERVIEW OVERVIEW
======== ========
...@@ -238,3 +233,9 @@ QUERY EXPRESSION EXAMPLES ...@@ -238,3 +233,9 @@ QUERY EXPRESSION EXAMPLES
their ESI subrequests. (Assumes request grouping mode). :: their ESI subrequests. (Assumes request grouping mode). ::
BerespStatus >= 500 or {2+}ReqEnd[5] > 1. BerespStatus >= 500 or {2+}ReqEnd[5] > 1.
HISTORY
=======
This document was written by Martin Blix Grydeland.
...@@ -8,12 +8,6 @@ VSL ...@@ -8,12 +8,6 @@ VSL
Shared Memory Logging Shared Memory Logging
--------------------- ---------------------
:Author: Poul-Henning Kamp
:Author: Martin Blix Grydeland
:Date: 2013-10-16
:Version: 1.0
:Manual section: 7
OVERVIEW OVERVIEW
======== ========
...@@ -26,6 +20,14 @@ VSL tags ...@@ -26,6 +20,14 @@ VSL tags
.. include:: ../../../lib/libvarnishapi/vsl-tags.rst .. include:: ../../../lib/libvarnishapi/vsl-tags.rst
HISTORY
=======
This document was initially written by Poul-Henning Kamp, and later updated by
Martin Blix Grydeland.
SEE ALSO SEE ALSO
======== ========
* varnishlog(1) * varnishlog(1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment