diff options
author | Jim P <jim@pingle.org> | 2013-03-08 16:19:53 -0800 |
---|---|---|
committer | Jim P <jim@pingle.org> | 2013-03-08 16:19:53 -0800 |
commit | edb2afcf002c5039fb21e5085561c60b3a57c558 (patch) | |
tree | 718e741b89bbf8502a7f6ec79abd7c4a74f3e4d8 /config/haproxy-devel/haproxy_listeners_edit.php | |
parent | ba50fc41599867dbfdd214209a04375b8df6c86d (diff) | |
parent | e1a963c1f543873630b104d244151ed70c0b9da7 (diff) | |
download | pfsense-packages-edb2afcf002c5039fb21e5085561c60b3a57c558.tar.gz pfsense-packages-edb2afcf002c5039fb21e5085561c60b3a57c558.tar.bz2 pfsense-packages-edb2afcf002c5039fb21e5085561c60b3a57c558.zip |
Merge pull request #404 from PiBa-NL/haproxy-devel-2.1
haproxy-devel, small bugfixes.. ssl checkbox selection, no httpcheck, req_ssl_hello_type
Diffstat (limited to 'config/haproxy-devel/haproxy_listeners_edit.php')
-rw-r--r-- | config/haproxy-devel/haproxy_listeners_edit.php | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/config/haproxy-devel/haproxy_listeners_edit.php b/config/haproxy-devel/haproxy_listeners_edit.php index c61954ac..3139250c 100644 --- a/config/haproxy-devel/haproxy_listeners_edit.php +++ b/config/haproxy-devel/haproxy_listeners_edit.php @@ -33,6 +33,16 @@ require("guiconfig.inc"); require_once("haproxy.inc"); +/* Compatibility function for pfSense 2.0 */ +if (!function_exists("cert_get_purpose")) { + function cert_get_purpose(){ + $result = array(); + $result['server'] = "Yes"; + return $result; + } +} +/**/ + function get_certificat_usage($refid) { $usage = array(); $cert = lookup_cert($refid); @@ -55,7 +65,7 @@ function get_certificat_usage($refid) { return $usage; } -/// This function (is intendet to) provides a uniform way to retrieve a list of use selectable certificates +// This function (is intended to) provides a uniform way to retrieve a list of server certificates function get_certificates_server($get_includeWebCert=false) { global $config; $certificates=array(); @@ -64,7 +74,7 @@ function get_certificates_server($get_includeWebCert=false) { { if ($get_ca == false && is_webgui_cert($cert['refid'])) continue; - + $purpose = cert_get_purpose($cert['crt']); if ($purpose['server'] != 'Yes') continue; @@ -496,7 +506,8 @@ include("head.inc"); <td width="78%" class="vtable" colspan="2"> <input id="secondary" name="secondary" type="checkbox" value="yes" <?php if ($pconfig['secondary']=='yes') echo "checked"; ?> onclick="updatevisibility();">secondary backend</checkbox><br/> Use this setting to configure multiple backends/accesslists for a single frontend.<br/> - All settings of which only 1 can exist will be hidden. And + All settings of which only 1 can exist will be hidden.<br/> + The frontend settings will be merged into 1 set of frontend configuration. </td> </tr> <tr align="left"> @@ -513,6 +524,7 @@ include("head.inc"); <td width="78%" class="vtable"> <select name="extaddr" class="formfld"> <option value="" <?php if (!$pconfig['extaddr']) echo "selected"; ?>>Interface address</option> + <option value="localhost" <?php if ('localhost' == $pconfig['extaddr']) echo "selected"; ?>>Localhost</option> <?php if (is_array($config['virtualip']['vip'])): foreach ($config['virtualip']['vip'] as $sn): |