aboutsummaryrefslogtreecommitdiffstats
path: root/config/haproxy
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-12-22 15:27:58 -0500
committerScott Ullrich <sullrich@pfsense.org>2009-12-22 15:27:58 -0500
commit5c479d1ebd0a2dcb877c2b3db6570b0e7d92aa9c (patch)
tree2051c9798744b26c8dd48400c0ff660384259d24 /config/haproxy
parentf05d48f35b901886e7d57ac2ed7ff5d86fdf0f8b (diff)
downloadpfsense-packages-5c479d1ebd0a2dcb877c2b3db6570b0e7d92aa9c.tar.gz
pfsense-packages-5c479d1ebd0a2dcb877c2b3db6570b0e7d92aa9c.tar.bz2
pfsense-packages-5c479d1ebd0a2dcb877c2b3db6570b0e7d92aa9c.zip
Add pass thru box for global settings
Diffstat (limited to 'config/haproxy')
-rw-r--r--config/haproxy/haproxy.inc2
-rwxr-xr-xconfig/haproxy/haproxy_global.php18
2 files changed, 20 insertions, 0 deletions
diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc
index f8b5efbf..a14a4fd8 100644
--- a/config/haproxy/haproxy.inc
+++ b/config/haproxy/haproxy.inc
@@ -108,6 +108,8 @@ function haproxy_configure() {
if(is_array($a_global)) {
fwrite ($fd, "global\n");
+ if($a_global['advanced'])
+ fwrite ($fd, "\t" . $a_global['advanced'] . "\n");
fwrite ($fd, "\tmaxconn\t\t\t".$a_global['maxconn']."\n");
if($a_global['remotesyslog'])
fwrite ($fd, "\tlog\t\t\t{$a_global['remotesyslog']}\n");
diff --git a/config/haproxy/haproxy_global.php b/config/haproxy/haproxy_global.php
index 253cc397..52e1c5be 100755
--- a/config/haproxy/haproxy_global.php
+++ b/config/haproxy/haproxy_global.php
@@ -77,6 +77,7 @@ if ($_POST) {
$config['installedpackages']['haproxy']['synchost2'] = $_POST['synchost3'] ? $_POST['synchost3'] : false;
$config['installedpackages']['haproxy']['remotesyslog'] = $_POST['remotesyslog'] ? $_POST['remotesyslog'] : false;
$config['installedpackages']['haproxy']['syncpassword'] = $_POST['syncpassword'] ? $_POST['syncpassword'] : false;
+ $config['installedpackages']['haproxy']['advanced'] = $_POST['advanced'] ? $_POST['advanced'] : false;
touch($d_haproxyconfdirty_path);
write_config();
}
@@ -92,6 +93,7 @@ $pconfig['synchost1'] = $config['installedpackages']['haproxy']['synchost1'];
$pconfig['synchost2'] = $config['installedpackages']['haproxy']['synchost2'];
$pconfig['synchost3'] = $config['installedpackages']['haproxy']['synchost3'];
$pconfig['remotesyslog'] = $config['installedpackages']['haproxy']['remotesyslog'];
+$pconfig['advanced'] = $config['installedpackages']['haproxy']['advanced'];
$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
if(strstr($pfSversion, "1.2"))
@@ -210,6 +212,22 @@ function enable_change(enable_change) {
</td>
</tr>
<tr>
+ <td colspan="2" valign="top" class="listtopic">Global Advanced pass thru</td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top" class="vncell">&nbsp;</td>
+ <td width="78%" class="vtable">
+ <textarea name='advanced' rows="4" 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>
+ </tr>
+ <tr>
+ <td>
+ &nbsp;
+ </td>
+ </tr>
+ <tr>
<td colspan="2" valign="top" class="listtopic">Configuration synchronization</td>
</tr>
<tr>