diff options
| -rwxr-xr-x | etc/rc.carpbackup | 3 | ||||
| -rwxr-xr-x | etc/rc.carpmaster | 3 | ||||
| -rwxr-xr-x | usr/local/www/firewall_virtual_ip.php | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/etc/rc.carpbackup b/etc/rc.carpbackup index 76cdfac..d463d45 100755 --- a/etc/rc.carpbackup +++ b/etc/rc.carpbackup @@ -33,8 +33,9 @@ require_once("functions.inc"); require_once("config.inc"); require_once("notices.inc"); require_once("openvpn.inc"); +require_once("interfaces.inc"); -$notificationmsg = "A carp cluster member has resumed the state 'BACKUP'"; +$notificationmsg = sprintf('Carp cluster member "%2$s (%1$s)" has resumed the state "BACKUP"',$argv[1],convert_friendly_interface_to_friendly_descr($argv[1])); notify_via_smtp($notificationmsg); notify_via_growl($notificationmsg); diff --git a/etc/rc.carpmaster b/etc/rc.carpmaster index cb5395e..f57d150 100755 --- a/etc/rc.carpmaster +++ b/etc/rc.carpmaster @@ -33,8 +33,9 @@ require_once("functions.inc"); require_once("config.inc"); require_once("notices.inc"); require_once("openvpn.inc"); +require_once("interfaces.inc"); -$notificationmsg = "A carp cluster member has resumed the state 'MASTER'"; +$notificationmsg = sprintf('Carp cluster member "%2$s (%1$s)" has resumed the state "MASTER"',$argv[1],convert_friendly_interface_to_friendly_descr($argv[1])); notify_via_smtp($notificationmsg); notify_via_growl($notificationmsg); diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php index 36e48ab..547ce4b 100755 --- a/usr/local/www/firewall_virtual_ip.php +++ b/usr/local/www/firewall_virtual_ip.php @@ -180,6 +180,7 @@ include("head.inc"); <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td width="30%" class="listhdrr"><?=gettext("Virtual IP address");?></td> + <td width="10%" class="listhdrr"><?=gettext("Interface");?></td> <td width="10%" class="listhdrr"><?=gettext("Type");?></td> <td width="40%" class="listhdr"><?=gettext("Description");?></td> <td width="10%" class="list"> @@ -204,6 +205,9 @@ include("head.inc"); ?> <?php if($vipent['mode'] == "carp") echo " (vhid {$vipent['vhid']})"; ?> </td> + <td class="listr" ondblclick="document.location='firewall_virtual_ip_edit.php?id=<?=$i;?>';"> + <?=htmlspecialchars(strtoupper($config['interfaces'][$vipent['interface']]['descr']));?> + </td> <td class="listr" align="center" ondblclick="document.location='firewall_virtual_ip_edit.php?id=<?=$i;?>';"> <? if($vipent['mode'] == "proxyarp") echo "<img src='./themes/".$g['theme']."/images/icons/icon_parp.gif' title='Proxy ARP'>"; elseif($vipent['mode'] == "carp") echo "<img src='./themes/".$g['theme']."/images/icons/icon_carp.gif' title='CARP'>"; elseif($vipent['mode'] == "other") echo "<img src='./themes/".$g['theme']."/images/icons/icon_other.gif' title='Other'>"; elseif($vipent['mode'] == "ipalias") echo "<img src='./themes/".$g['theme']."/images/icons/icon_ifalias.gif' title='IP Alias'>";?> </td> @@ -222,7 +226,7 @@ include("head.inc"); <?php endif; ?> <?php $i++; endforeach; ?> <tr> - <td class="list" colspan="3"></td> + <td class="list" colspan="4"></td> <td class="list"> <table border="0" cellspacing="0" cellpadding="1"> <tr> @@ -233,7 +237,7 @@ include("head.inc"); </td> </tr> <tr> - <td colspan="4"> + <td colspan="5"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br> </strong></span><?=gettext("The virtual IP addresses defined on this page may be used in");?><a href="firewall_nat.php"> <?=gettext("NAT"); ?> </a><?=gettext("mappings.");?><br> <?=gettext("You can check the status of your CARP Virtual IPs and interfaces ");?><a href="carp_status.php"><?=gettext("here");?></a>.</span></p> |
