diff options
| author | Ermal Luçi <eri@pfsense.org> | 2014-03-19 16:35:25 +0100 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2014-03-19 16:35:25 +0100 |
| commit | fd710b1c45207f551d7b0a38eb95b5b5e353ac77 (patch) | |
| tree | 52a09cb1a239f0279763db31b6cad430e3bd2efb /config/haproxy-devel/haproxy_global.php | |
| parent | 6e77b1d72ae1097ea39defc80361db0a8c7fdebd (diff) | |
| parent | 4505f0c18e3ecf837063d9b9711999cfdd17d12e (diff) | |
| download | pfsense-packages-fd710b1c45207f551d7b0a38eb95b5b5e353ac77.tar.gz pfsense-packages-fd710b1c45207f551d7b0a38eb95b5b5e353ac77.tar.bz2 pfsense-packages-fd710b1c45207f551d7b0a38eb95b5b5e353ac77.zip | |
Merge pull request #596 from PiBa-NL/hap_cleanup_help
haproxy-devel, add some extra 'help' text and correction on source formating tabs
Diffstat (limited to 'config/haproxy-devel/haproxy_global.php')
| -rwxr-xr-x | config/haproxy-devel/haproxy_global.php | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/config/haproxy-devel/haproxy_global.php b/config/haproxy-devel/haproxy_global.php index 5e4d96eb..44f01dc5 100755 --- a/config/haproxy-devel/haproxy_global.php +++ b/config/haproxy-devel/haproxy_global.php @@ -174,20 +174,6 @@ 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> @@ -393,7 +379,8 @@ function enable_change(enable_change) { <tr> <td width="22%" valign="top" class="vncell"> </td> <td width="78%" class="vtable"> - <textarea name='advanced' rows="4" cols="70" id='advanced'><?php echo $pconfig['advanced']; ?></textarea> + <? $textrowcount = max(substr_count($pconfig['advanced'],"\n"), 2) + 2; ?> + <textarea name='advanced' rows="<?=$textrowcount;?>" cols="70" id='advanced'><?php echo $pconfig['advanced']; ?></textarea> <br/> NOTE: paste text into this box that you would like to pass thru in the global settings area. </td> @@ -404,6 +391,19 @@ function enable_change(enable_change) { </td> </tr> <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();" />(Other changes on this page will be lost) + <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">Configuration synchronization</td> </tr> <tr> |