Attachment 154065 Details for Bug 238498 – add syncdaemon and sorry_server options to piranha gui

[patch] add syncdaemon and sorry_server options to piranha gui

piranha-gui-syncdaemon-sorry.patch (text/plain), 4.15 KB, created by Need Real Name on 2007-05-03 19:30:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Need Real Name

Created: 2007-05-03 19:30:50 UTC

Size: 4.15 KB

patch

obsolete

>diff -ru /usr/src/redhat/BUILD/piranha/web/web/secure/parse.php ./parse.php
>--- /usr/src/redhat/BUILD/piranha/web/web/secure/parse.php	2005-07-28 10:15:14.000000000 -0400
>+++ ./parse.php	2007-05-03 15:08:58.000000000 -0400
>@@ -84,7 +84,8 @@
> 		"deadtime"			=> "",
> 		"reservation_conflict_action"	=> "",
> 		"debug_level"			=> "",
>-		"monitor_links"			=> ""
>+		"monitor_links"			=> "",
>+		"syncdaemon"			=> ""
> 	);
> 
> /* Global file descriptor for use as a pointer to the lvs.cf file */
>@@ -201,6 +202,9 @@
> 			case "monitor_links"			:	$prim['monitor_links']			= $datum;
> 									break;
> 
>+			case "syncdaemon"			:	$prim['syncdaemon']			= $datum;
>+									break;
>+
> 			case ""					:	break;
> 			default					:	if ($debug) { echo "<FONT COLOR=\"BLUE\">Level $level - garbage [$name] (ignored line [$buffer])</FONT><BR>"; }
> 									break;
>@@ -287,6 +291,8 @@
> 							if ($debug) { echo "<FONT COLOR=\"yellow\"><I>Asked for virtual service </I><B>\$virt[$virt_count]</B></FONT><BR>"; };
> 							if ($service == "lvs") $virt[$virt_count]['virtual']	= $datum;
> 							break;
>+			case "sorry_server"	:	if ($service == "lvs") $virt[$virt_count]['sorry_server']	= $datum;
>+							break;
> 			case "fwmark"		:	if ($service == "lvs") $virt[$virt_count]['fwmark']	= $datum;
> 							break;
> 			case "load_monitor"	:	if ($service == "lvs") $virt[$virt_count]['load_monitor']	= $datum;
>@@ -712,6 +718,11 @@
> 		if ($debug) { echo "monitor_links = "			. $prim['monitor_links']		. "<BR>"; };
> 	}
> 
>+
>+	if ($prim['syncdaemon'] != "" ){
>+		fputs ($fd, "syncdaemon = "				. $prim['syncdaemon']		. "\n", 80);
>+		if ($debug) { echo "syncdaemon = "			. $prim['syncdaemon']		. "<BR>"; };
>+	}
> 	
> 	while ( $fail[$loop1]['failover'] != "" ) {
> 		if ((($loop1 == $delete_item ) && ($level == "1")) && ($prim['service'] == "fos")) {  $loop1++; $loop2 = 1; } else {
>@@ -825,6 +836,12 @@
> 				if ($debug) { echo "$egap1 address "		. $virt[$loop3]['address']	. "<BR>"; };
> 			}
> 
>+			if (isset($virt[$loop3]['sorry_server']) &&
>+			    $virt[$loop3]['sorry_server'] != "") {
>+				fputs ($fd, "$gap1 sorry_server = "			. $virt[$loop3]['sorry_server']	. "\n", 80);
>+				if ($debug) { echo "$egap1 sorry_server "		. $virt[$loop3]['sorry_server']	. "<BR>"; };
>+			}
>+
> 			if (isset($virt[$loop3]['vip_nmask']) &&
> 			    $virt[$loop3]['vip_nmask'] != "") {
> 				fputs ($fd, "$gap1 vip_nmask = "		. $virt[$loop3]['vip_nmask']	. "\n", 80);
>diff -ru /usr/src/redhat/BUILD/piranha/web/web/secure/redundancy.php ./redundancy.php
>--- /usr/src/redhat/BUILD/piranha/web/web/secure/redundancy.php	2005-07-28 10:34:20.000000000 -0400
>+++ ./redundancy.php	2007-05-03 12:13:04.000000000 -0400
>@@ -92,6 +92,15 @@
> 		} else { 
> 			$prim['monitor_links'] = "0";
> 		}
>+		if (isset($_GET['syncdaemon'])) {
>+			if ($_GET['syncdaemon'] == "on") {
>+				$prim['syncdaemon'] = "1";
>+			} else { 
>+				$prim['syncdaemon'] = "0";
>+			}
>+		} else { 
>+			$prim['syncdaemon'] = "0";
>+		}
> 		
> 		/*
> 		$prim['backup_private']		= $_GET['redundant_private'];
>@@ -266,6 +275,17 @@
> 			?>
> 			</TD>
> 		</TR>
>+		<TR>
>+			<TD>Syncdaemon:</TD>
>+			<TD><INPUT TYPE="checkbox" NAME="syncdaemon" 
>+			<?php
>+			if ($prim['syncdaemon'] == "1") {
>+				echo "CHECKED";
>+			};
>+			echo ">";
>+			?>
>+			</TD>
>+		</TR>
> 	</TABLE>
> 	<HR>
> <?php } ?>
>diff -ru /usr/src/redhat/BUILD/piranha/web/web/secure/virtual_edit_virt.php ./virtual_edit_virt.php
>--- /usr/src/redhat/BUILD/piranha/web/web/secure/virtual_edit_virt.php	2005-02-08 02:41:24.000000000 -0500
>+++ ./virtual_edit_virt.php	2007-05-03 15:05:41.000000000 -0400
>@@ -84,6 +84,7 @@
> 
>                 $temp[0] = $_GET['address'];
>                 $temp[1] = $_GET['device'];
>+                $virt[$selected_host]['sorry_server']       =       $_GET['sorry_server'];
>                 $virt[$selected_host]['address']      		=       $_GET['address'] . " " . $_GET['device'];
> 	}
> 
>@@ -257,6 +258,10 @@
> 		</TD>
> 	</TR>
> 	<TR>
>+		<TD>Sorry Server: </TD>
>+		<TD><INPUT TYPE="TEXT" NAME="sorry_server" VALUE=<?php echo $virt[$selected_host]['sorry_server'] ?>></TD>
>+	</TR>
>+	<TR>
> 		<TD>Firewall Mark: </TD>
> 		<TD> <INPUT TYPE="TEXT" NAME="fwmark" VALUE="<?php if (isset($virt[$selected_host]['fwmark'])) {
> 								      echo $virt[$selected_host]['fwmark']; } ?>"></TD>

Actions: View | Diff

Attachments on bug 238498: 153903 | 153907 | 153914 | 153954 | 154052 | 154065 | 154291 | 318124