diff options
| -rw-r--r-- | config/varnish64/varnish.inc | 4 | ||||
| -rwxr-xr-x | pkg_config.8.xml.amd64 | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/config/varnish64/varnish.inc b/config/varnish64/varnish.inc index 026f602c..9673be4f 100644 --- a/config/varnish64/varnish.inc +++ b/config/varnish64/varnish.inc @@ -152,7 +152,6 @@ EOAU; $first_byte_timeout = $backend['first_byte_timeout'] . "s"; else $first_byte_timeout = "300s"; - if($backend['probe_url']) $probe_url = $backend['probe_url']; else @@ -173,7 +172,6 @@ EOAU; $probe_threshold = $backend['probe_threshold']; else $probe_threshold = "5"; - $backends .= <<<EOFA backend {$backend['backendname']} { .host = "{$backend['ipaddress']}"; @@ -199,7 +197,7 @@ EOFA; if($backend['row']) foreach($backend['row'] as $be) { if($be['weight']) - $weight = "\n\t\t\t.weight = {$be['weight']};\n" + $weight = "\t\t\t.weight = {$be['weight']};\n" else $weight = ""; $director .= "\t{\n\t\t.backend = {$be['backendname']};\n{$weight}\t}"; diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 868bef42..b00cf513 100755 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -12,7 +12,7 @@ <status>ALPHA</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/varnish/backend.xml</config_file> - <configurationfile>backend.xml</configurationfile> + <configurationfile>varnish_backends.xml</configurationfile> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> <depends_on_package>varnish-2.1.tbz</depends_on_package> <depends_on_package>gcc-4.2.5.20090325_3.tbz</depends_on_package> |