diff options
| author | Jim P <jim@pingle.org> | 2013-11-23 14:23:39 -0800 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2013-11-23 14:23:39 -0800 |
| commit | f581b75f072a51330de2619669fc799a8ac5de73 (patch) | |
| tree | 590a5fe098ee6a7e86dfa426372a44b5f7d6ebbb /config/haproxy-devel/haproxy_global.php | |
| parent | 3a5b698d014f470e7b475261d5e7d2926d4fc220 (diff) | |
| parent | cecde162c97ceb3309b29c98ef1648abcb0379bf (diff) | |
| download | pfsense-packages-f581b75f072a51330de2619669fc799a8ac5de73.tar.gz pfsense-packages-f581b75f072a51330de2619669fc799a8ac5de73.tar.bz2 pfsense-packages-f581b75f072a51330de2619669fc799a8ac5de73.zip | |
Merge pull request #554 from PiBa-NL/haproxy_spellcheck
haproxy-devel, changes: IPv6, certificate chains, new interface selections.
Diffstat (limited to 'config/haproxy-devel/haproxy_global.php')
| -rwxr-xr-x | config/haproxy-devel/haproxy_global.php | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/config/haproxy-devel/haproxy_global.php b/config/haproxy-devel/haproxy_global.php index ff8d1280..0ff0e10e 100755 --- a/config/haproxy-devel/haproxy_global.php +++ b/config/haproxy-devel/haproxy_global.php @@ -31,6 +31,7 @@ require_once("guiconfig.inc"); require_once("haproxy.inc"); +require_once("haproxy_utils.inc"); require_once("globals.inc"); if (!is_array($config['installedpackages']['haproxy'])) @@ -41,6 +42,9 @@ if ($_POST) { unset($input_errors); $pconfig = $_POST; + if ($_POST['calculate_certificate_chain']) { + haproxy_recalculate_certifcate_chain(); + } else if ($_POST['apply']) { $result = haproxy_check_and_run($savemsg, true); if ($result) @@ -154,6 +158,20 @@ function enable_change(enable_change) { <div id="mainarea"> <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> + <td colspan="2" valign="top" class="listtopic">Recalculate certificate chain.</td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell"> </td> + <td width="78%" class="vtable"> + <input type="hidden" name="calculate_certificate_chain" id="calculate_certificate_chain"> + <input type="button" class="formbtn" value="Recalculate certificate chains" onclick="$('calculate_certificate_chain').value='true';document.iform.submit();"> + <br/> + This can be required after certificates have been created or imported. As pfSense 2.1.0 currently does not + always keep track of these dependencies which might be required to create a proper certificate chain when using SSLoffloading. + </td> + </tr> + + <tr> <td colspan="2" valign="top" class="listtopic">General settings</td> </tr> <tr> |