diff options
Diffstat (limited to 'config/varnish64')
| -rw-r--r-- | config/varnish64/varnish.inc | 8 | ||||
| -rw-r--r-- | config/varnish64/varnish_backends.xml | 2 | ||||
| -rw-r--r-- | config/varnish64/varnish_lb_directors.xml | 2 | ||||
| -rw-r--r-- | config/varnish64/varnish_sync.xml | 6 |
4 files changed, 8 insertions, 10 deletions
diff --git a/config/varnish64/varnish.inc b/config/varnish64/varnish.inc index 2b4a6f6e..61704fb4 100644 --- a/config/varnish64/varnish.inc +++ b/config/varnish64/varnish.inc @@ -216,7 +216,7 @@ function get_backend_config_txt() { if($backend['port']) $connect_timeout = $backend['port'] . "s"; else - $connect_timeout = "80"; + $connect_timeout = "80s"; if($backend['first_byte_timeout']) $first_byte_timeout = $backend['first_byte_timeout'] . "s"; else @@ -475,11 +475,7 @@ function varnish_sync_on_changes() { $previous_ip = ""; $x=0; $sh = $config['installedpackages']['varnishsync']['config'][0]; - for($x=1; $x<isset($sh[$x]); $x++) { - if($x > 1) - $counter = $x; - else - $counter = ""; + for($x=1; $x<7); $x++) { $sync_to_ip = ""; $password = ""; if($sh['ipaddress' . $counter]) { diff --git a/config/varnish64/varnish_backends.xml b/config/varnish64/varnish_backends.xml index 5602be26..8b8d6a8a 100644 --- a/config/varnish64/varnish_backends.xml +++ b/config/varnish64/varnish_backends.xml @@ -185,7 +185,7 @@ </field> <field> <fielddescr>Probe URL</fielddescr> - <fieldname>probe_interval</fieldname> + <fieldname>probe_url</fieldname> <description>Enter the URL that varnish will use to ensure that this backend is healthy.</description> <type>input</type> </field> diff --git a/config/varnish64/varnish_lb_directors.xml b/config/varnish64/varnish_lb_directors.xml index abbed29f..c5c163f3 100644 --- a/config/varnish64/varnish_lb_directors.xml +++ b/config/varnish64/varnish_lb_directors.xml @@ -130,6 +130,8 @@ <options> <option><name>Round-robin</name><value>round-robin</value></option> <option><name>Random</name><value>random</value></option> + <option><name>Client</name><value>client</value></option> + </options> </field> <field> diff --git a/config/varnish64/varnish_sync.xml b/config/varnish64/varnish_sync.xml index 24c8e866..ea8afa68 100644 --- a/config/varnish64/varnish_sync.xml +++ b/config/varnish64/varnish_sync.xml @@ -80,7 +80,7 @@ <field> <type>listtopic</type> <fieldname>temp</fieldname> - <name>Enbable Varnish configuration sync</name> + <name>Enable Varnish configuration sync</name> </field> <field> <fielddescr>Automatically sync Varnish configuration changes</fielddescr> @@ -95,13 +95,13 @@ </field> <field> <fielddescr>IP Address</fielddescr> - <fieldname>ipaddress</fieldname> + <fieldname>ipaddress1</fieldname> <description>The IP address of the first host that Varnish will Sync its Varnish configuration data to.</description> <type>input</type> </field> <field> <fielddescr>Password</fielddescr> - <fieldname>password</fieldname> + <fieldname>password1</fieldname> <description>Admin password of the first host that Varnish will Sync its Varnish configuration data to.</description> <type>password</type> </field> |