Merge pull request #1015 from PiBa-NL/haproxy_0.28

2 files changed, 76 insertions, 9 deletions

diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc
index eceef783..de1963b0 100644
--- a/config/haproxy-devel/pkg/haproxy.inc
+++ b/config/haproxy-devel/pkg/haproxy.inc
@@ -212,7 +212,18 @@ $a_error['500'] = array('descr' => "internal error");
 $a_error['502'] = array('descr' => "server response invalid or blocked");
 $a_error['503'] = array('descr' => "no server was available to handle the request");
 $a_error['504'] = array('descr' => "timeout before the server responds");
-   
+
+global $a_sysloglevel;
+$a_sysloglevel = array();
+$a_sysloglevel['emerg'] = array('name' => "Emergency");
+$a_sysloglevel['alert'] = array('name' => "Alert");
+$a_sysloglevel['crit'] = array('name' => "Critical");
+$a_sysloglevel['err'] = array('name' => "Error");
+$a_sysloglevel['warning'] = array('name' => "Warning");
+$a_sysloglevel['notice'] = array('name' => "Notice");
+$a_sysloglevel['info'] = array('name' => "Informational");
+$a_sysloglevel['debug'] = array('name' => "Debugging");
+
 if(!function_exists('group_ports')){
 // function group_ports() is present in pfSense 2.2 in util.inc
 /* create ranges of sequential port numbers (200:215) and remove duplicates */
@@ -264,6 +275,15 @@ function group_ports($ports) {
 }
 }
 
+global $haproxy_version;
+function haproxy_verion() {
+	global $haproxy_version;
+	if (empty($haproxy_version)) {
+		$haproxy_version = shell_exec("haproxy -v | head -n 1 | awk '{ print $3 }'");
+	}
+	return $haproxy_version;
+}
+
 function haproxy_portoralias_to_list($port_or_alias) {
 	// input: a port or aliasname: 80 https MyPortAlias
 	// returns: a array of ports and portranges 80 443 8000:8010
@@ -592,8 +612,11 @@ function haproxy_find_acl($name) {
 }
 
 function write_backend($configpath, $fd, $name, $pool, $backendsettings) {
+	global $config;
 	$frontend = $backendsettings['frontend'];
 	$ipversion = $backendsettings['ipversion'];
+	$a_global = &$config['installedpackages']['haproxy'];
+	$a_mailers = &$config['installedpackages']['haproxy']['email_mailers']['items'];
 
 	if(!is_array($pool['ha_servers']['item']) && !$pool['stats_enabled']=='yes')
 		return;
@@ -610,6 +633,36 @@ function write_backend($configpath, $fd, $name, $pool, $backendsettings) {
 		$backend_mode = $frontendtype;
 	}
 	fwrite ($fd, "\tmode\t\t\t" . $backend_mode . "\n");
+	
+	if (haproxy_verion() >= '1.6') {
+		$use_mailers = is_array($a_mailers) && count($a_mailers) > 0;
+		if ($use_mailers) {
+			fwrite ($fd, "\t# use mailers\n");
+			if (empty($pool['email_level'])) {
+				$email_level = $a_global['email_level'];
+			} else {
+				$email_level = $pool['email_level'];
+			}
+		
+			fwrite ($fd, "\t# level  $email_level \n");
+			if (!empty($email_level) && $email_level != 'dontlog') {
+				if (empty($pool['email_to'])) {
+					$email_to = $a_global['email_to'];
+				} else {
+					$email_to = $pool['email_to'];
+				}
+			
+				fwrite ($fd, "\temail-alert mailers\t\t\tglobalmailers\n");
+				fwrite ($fd, "\temail-alert level\t\t\t{$email_level}\n");
+				fwrite ($fd, "\temail-alert from\t\t\t{$a_global['email_from']}\n");
+				fwrite ($fd, "\temail-alert to\t\t\t{$email_to}\n");
+				if (!empty($a_global['email_myhostname'])) {
+					fwrite ($fd, "\temail-alert myhostname\t\t\t{$a_global['email_myhostname']}\n");
+				}
+			}
+		}
+	}
+	
 	if ($pool['log-health-checks'] == 'yes')
 		fwrite ($fd, "\toption\t\t\tlog-health-checks\n");
 		
@@ -732,8 +785,6 @@ function write_backend($configpath, $fd, $name, $pool, $backendsettings) {
 		if ($check_type == "Agent") {
 			$checkport = " port " . $pool['monitor_agentport'];
 		}
-	} else {
-		$optioncheck = "httpchk";
 	}
 	
 	if($pool['balance'])
@@ -1049,9 +1100,9 @@ function haproxy_updateocsp($socketupdate = true) {
 		haproxy_updateocsp_one($socketupdate, $filename, $frontend['name']);
 		
 		$subfolder = "$configpath/{$frontend['name']}";
-		$certs = $frontend['ha_certificates']['item'];
-		if (is_array($certs)){
-			foreach($certs as $cert){
+		if (is_arrayset($frontend, 'ha_certificates', 'item')) {
+			$certs = $frontend['ha_certificates']['item'];
+			foreach($certs as $cert) {
 				$filename = "$subfolder/{$cert['ssl_certificate']}.pem";
 				haproxy_updateocsp_one($socketupdate, $filename, $frontend['name']);
 			}
@@ -1075,6 +1126,7 @@ function haproxy_writeconf($configpath) {
 	$a_global = &$config['installedpackages']['haproxy'];
 	$a_frontends = &$config['installedpackages']['haproxy']['ha_backends']['item'];
 	$a_backends = &$config['installedpackages']['haproxy']['ha_pools']['item'];
+	$a_mailers = &$config['installedpackages']['haproxy']['email_mailers']['items'];
 	
 	$fd = fopen($configfile, "w");
 	if(is_array($a_global)) {
@@ -1130,6 +1182,17 @@ function haproxy_writeconf($configpath) {
 			fwrite ($fd, "\n");
 		}
 	}
+	
+	if (haproxy_verion() >= '1.6') {
+		$use_mailers = is_array($a_mailers) && count($a_mailers) > 0;
+		if ($use_mailers) {
+			fwrite ($fd, "mailers globalmailers\n");
+			foreach($a_mailers as $mailer) {
+				fwrite ($fd, "\tmailer {$mailer['name']} {$mailer['mailserver']}:{$mailer['mailserverport']}\n");
+			}
+			fwrite ($fd, "\n");
+		}
+	}
 
 	// Try and get a unique array for address:port as frontends can duplicate
 	$a_bind = array();
@@ -1158,7 +1221,8 @@ function haproxy_writeconf($configpath) {
 
 				haproxy_write_certificate_fullchain($filename, $frontend['ssloffloadcert']);
 				if ($frontend['sslocsp'] == 'yes') {
-					if (!empty(haproxy_getocspurl($filename))) {
+					$ocspurl = haproxy_getocspurl($filename);
+					if (!empty($ocspurl)) {
 						haproxy_write_certificate_issuer($filename . ".issuer", $frontend['ssloffloadcert']);
 						touch($filename . ".ocsp");//create initial empty file. this will trigger updates, and inform haproxy it 'should' be using ocsp
 					}
@@ -1173,7 +1237,8 @@ function haproxy_writeconf($configpath) {
 							$filenamefoldercert = "$subfolder/{$cert['ssl_certificate']}.pem";
 							haproxy_write_certificate_fullchain($filenamefoldercert, $cert['ssl_certificate']);
 							if ($frontend['sslocsp'] == 'yes') {
-								if (!empty(haproxy_getocspurl($filenamefoldercert))) {
+								$ocspurl = haproxy_getocspurl($filenamefoldercert);
+								if (!empty($ocspurl)) {
 									haproxy_write_certificate_issuer($filenamefoldercert . ".issuer", $cert['ssl_certificate']);
 									touch($filenamefoldercert . ".ocsp");
 								}
diff --git a/config/haproxy-devel/pkg/haproxy_htmllist.inc b/config/haproxy-devel/pkg/haproxy_htmllist.inc
index f873028e..394f3ff6 100644
--- a/config/haproxy-devel/pkg/haproxy_htmllist.inc
+++ b/config/haproxy-devel/pkg/haproxy_htmllist.inc
@@ -114,7 +114,9 @@ class HaproxyHtmlList
 				echo $itemvalue=='yes' ? gettext('yes') : gettext('no');
 			} else
 			if ($itemtype == "textarea"){
-				echo htmlspecialchars(base64_decode($itemvalue));
+				echo '<div style="overlow:scroll;max-height:120px;overflow-y: scroll;">';
+				echo str_replace("\n","<br/>", htmlspecialchars(base64_decode($itemvalue)));
+				echo '</div>';
 			} else
 				echo htmlspecialchars($itemvalue);
 		}