From 574a0e07eb551e0291493d523819729a37c4b1e1 Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Thu, 20 Aug 2015 00:21:30 +0200 Subject: haproxy-devel, fix package for pfsense 2.1.5, bump pkg v0.28 -add email settings for 1.6-dev version -remove call to nonexisting javascript function -put a maximum height to a table textarea + scrollbar -remove httpchk from config file when not used --- config/haproxy-devel/www/haproxy_files.php | 2 +- config/haproxy-devel/www/haproxy_global.php | 113 +++++++++++++++++++++++-- config/haproxy-devel/www/haproxy_pool_edit.php | 35 +++++++- 3 files changed, 140 insertions(+), 10 deletions(-) (limited to 'config/haproxy-devel/www') diff --git a/config/haproxy-devel/www/haproxy_files.php b/config/haproxy-devel/www/haproxy_files.php index 4946a7be..12ab5a88 100644 --- a/config/haproxy-devel/www/haproxy_files.php +++ b/config/haproxy-devel/www/haproxy_files.php @@ -155,7 +155,7 @@ include("head.inc"); - + diff --git a/config/haproxy-devel/www/haproxy_global.php b/config/haproxy-devel/www/haproxy_global.php index 978d778d..2ae92256 100644 --- a/config/haproxy-devel/www/haproxy_global.php +++ b/config/haproxy-devel/www/haproxy_global.php @@ -35,13 +35,38 @@ require_once("haproxy.inc"); require_once("haproxy_utils.inc"); require_once("globals.inc"); require_once("pkg_haproxy_tabs.inc"); +require_once("haproxy_htmllist.inc"); -$simplefields = array('localstats_refreshtime','localstats_sticktable_refreshtime','log-send-hostname','ssldefaultdhparam'); +$simplefields = array('localstats_refreshtime', 'localstats_sticktable_refreshtime', 'log-send-hostname', 'ssldefaultdhparam', + 'email_level', 'email_myhostname', 'email_from', 'email_to'); + +$none = array(); +$none['']['name'] = "Dont log"; +$a_sysloglevel = $none + $a_sysloglevel; + +$fields_mailers = array(); +$fields_mailers[0]['name'] = "name"; +$fields_mailers[0]['columnheader'] = "Name"; +$fields_mailers[0]['colwidth'] = "30%"; +$fields_mailers[0]['type'] = "textbox"; +$fields_mailers[0]['size'] = "20"; +$fields_mailers[1]['name'] = "mailserver"; +$fields_mailers[1]['columnheader'] = "Mailserver"; +$fields_mailers[1]['colwidth'] = "60%"; +$fields_mailers[1]['type'] = "textbox"; +$fields_mailers[1]['size'] = "60"; +$fields_mailers[2]['name'] = "mailserverport"; +$fields_mailers[2]['columnheader'] = "Mailserverport"; +$fields_mailers[2]['colwidth'] = "10%"; +$fields_mailers[2]['type'] = "textbox"; +$fields_mailers[2]['size'] = "10"; + +$mailerslist = new HaproxyHtmlList("table_mailers", $fields_mailers); +$mailerslist->keyfield = "name"; if (!is_array($config['installedpackages']['haproxy'])) $config['installedpackages']['haproxy'] = array(); - if ($_POST) { unset($input_errors); $pconfig = $_POST; @@ -56,16 +81,12 @@ if ($_POST) { if ($result) unlink_if_exists($d_haproxyconfdirty_path); } else { - //if ($_POST['enable']) { - // $reqdfields = explode(" ", "maxconn"); - // $reqdfieldsn = explode(",", "Maximum connections"); - //} + $a_mailers = $mailerslist->haproxy_htmllist_get_values(); + $pool['ha_servers']['item'] = $a_servers; if ($_POST['carpdev'] == "disabled") unset($_POST['carpdev']); - //do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); - if ($_POST['maxconn'] && (!is_numeric($_POST['maxconn']))) $input_errors[] = "The maximum number of connections should be numeric."; @@ -86,6 +107,8 @@ if ($_POST) { $input_errors[] = "Synchost3 needs to be an IPAddress.";*/ if (!$input_errors) { + $config['installedpackages']['haproxy']['email_mailers']['items'] = $a_mailers; + $config['installedpackages']['haproxy']['enable'] = $_POST['enable'] ? true : false; $config['installedpackages']['haproxy']['terminate_on_reload'] = $_POST['terminate_on_reload'] ? true : false; $config['installedpackages']['haproxy']['maxconn'] = $_POST['maxconn'] ? $_POST['maxconn'] : false; @@ -109,6 +132,8 @@ if ($_POST) { } } +$a_mailers = $config['installedpackages']['haproxy']['email_mailers']['items']; + $pconfig['enable'] = isset($config['installedpackages']['haproxy']['enable']); $pconfig['terminate_on_reload'] = isset($config['installedpackages']['haproxy']['terminate_on_reload']); $pconfig['maxconn'] = $config['installedpackages']['haproxy']['maxconn']; @@ -182,6 +207,12 @@ function enable_change(enable_change) { onClick="enable_change(false)" /> Enable HAProxy + + Installed version: + + + + Maximum connections @@ -368,6 +399,64 @@ function enable_change(enable_change) { size="18" maxlength="50" /> EXAMPLE: HaproxyMasterNode
Sets the hostname field in the syslog header. If empty defaults to the system hostname. +   + = '1.6' ) { ?> + + Email notifications + + + + Mailer servers + + + It is possible to send email alerts when the state of servers changes. If configured email alerts are sent to each mailer that is configured in a mailers section. Email is sent to mailers using SMTP. +
+ Draw($a_mailers); + ?> + + + + + Mail level + + + + Define the maximum loglevel to send emails for. + + + + + Mail myhostname + + + size="50" />
+ Define hostname to use as sending the emails. + + + + + Mail from + + + size="50"/>
+ Email address to be used as the sender of the emails. + + + + + Mail to + + + size="50"/>
+ Email address to send emails to. + + + +   Tuning @@ -487,7 +576,15 @@ Minimum and default value is: 1024, bigger values might increase CPU usage.
+