From acae946b0d56cfc8ca29a88b08a691e584fde302 Mon Sep 17 00:00:00 2001
From: Seth Mos <seth.mos@xs4all.nl>
Date: Fri, 18 Dec 2009 21:37:15 +0100
Subject: Make sure that the upgraded load balancer configuration reflects the
 new gateway names

---
 etc/inc/upgrade_config.inc                   | 2 ++
 usr/local/www/system_gateway_groups_edit.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 694f0a3..4c6ad24 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1547,6 +1547,8 @@ function upgrade_053_to_054() {
 				foreach($lbpool['servers'] as $member) {
 					$split = split("\|", $member);
 					$interface = $split[0];
+					/* on a upgraded configuration we automatically append _GW */
+					$interface = strtoupper($interface) . "_GW";
 					$monitor = $split[1];
 					/* on failover increment tier. Else always assign 1 */
 					if($lbpool['behaviour'] == "failover") {
diff --git a/usr/local/www/system_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php
index 974dc75..57aaf97 100755
--- a/usr/local/www/system_gateway_groups_edit.php
+++ b/usr/local/www/system_gateway_groups_edit.php
@@ -180,7 +180,7 @@ include("head.inc");
 				echo "<option value='3' $selected[3] >Tier 3</option>";
 				echo "<option value='4' $selected[4] >Tier 4</option>";
 				echo "<option value='5' $selected[5] >Tier 5</option>";
-				echo "</select> <strong>{$gateway['descr']}</strong><br/>";
+				echo "</select> <strong>{$name} - {$gateway['descr']}</strong><br/>";
 		 	}
 		?>
 			<br/><span class="vexpl">
-- 
cgit v1.1