diff options
| -rw-r--r-- | config/varnish64/varnish.inc | 13 | ||||
| -rw-r--r-- | config/varnish64/varnish_settings.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
3 files changed, 5 insertions, 12 deletions
diff --git a/config/varnish64/varnish.inc b/config/varnish64/varnish.inc index f842348f..654a8bae 100644 --- a/config/varnish64/varnish.inc +++ b/config/varnish64/varnish.inc @@ -261,15 +261,7 @@ function get_lb_directors_config_txt() { if($config['installedpackages']['varnishlbdirectors']['config'] != "") { foreach($config['installedpackages']['varnishlbdirectors']['config'] as $backend) { $director = ""; - if($backend['directortype']){ - switch($backend['directortype']){ - case "round-robin" : - case "hash" : - $weight=" "; - break; - } - - } + if($backend['directortype'] == "round-robin" ){$weight=" ";} if($backend['row']){ foreach($backend['row'] as $be) { if($be['weight'] && $weight != " ") @@ -356,7 +348,8 @@ function sync_package_varnish() { break; } } - if($vcl['clientbalance']){ + $plataform=system('uname -m'); + if($vcl['clientbalance'] && $plataform == 'amd64'){ $vcl_recv_basic.="\t#set client balance identity\n"; switch ($vcl['clientbalance']){ case 'url': diff --git a/config/varnish64/varnish_settings.xml b/config/varnish64/varnish_settings.xml index e19c684d..b533eb9b 100644 --- a/config/varnish64/varnish_settings.xml +++ b/config/varnish64/varnish_settings.xml @@ -144,7 +144,7 @@ <field> <fielddescr>Client identity method</fielddescr> <fieldname>clientbalance</fieldname> - <description>Select how varnish will balance clients when using client Load Balance method.</description> + <description><![CDATA[Select how varnish will balance clients when using client Load Balance method. (Choose IP address on i386 systems)]]></description> <type>select</type> <options> <option><name>IP address (keep sessions working)</name><value>ip</value></option> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 4dce6d46..9f585185 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -57,7 +57,7 @@ <website>http://varnish-cache.org</website> <pkginfolink>http://doc.pfsense.org/index.php/Varnish_package</pkginfolink> <category>Services</category> - <version>0.8.6</version> + <version>0.8.6.1</version> <status>BETA</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/varnish64/varnish_backends.xml</config_file> |