[Netpass-devel] NetPass MANIFEST,1.40,1.41 install,1.20,1.21

[jeff m. <jef...@us...>]

Update of /cvsroot/netpass/NetPass
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26972

Modified Files:
	MANIFEST install 
Log Message:
ipvsadm updated rpm

Index: install
===================================================================
RCS file: /cvsroot/netpass/NetPass/install,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- install	16 May 2005 16:10:41 -0000	1.20
+++ install	17 May 2005 02:57:36 -0000	1.21
@@ -88,6 +88,7 @@
 my $uninstall = 0;
 my $help      = 0;
 my @exclude   = ();
+my $R         = {}; # global registry
 
 GetOptions ("s=i" => \$STAGE,
 	    "c"   => \$copyOnly,
@@ -359,8 +360,19 @@
 
 ");
 
-	my $npvip = ask("If you are using HA, enter the virtual IP address for this
-NetPass cluster here (otherwise just hit enter): ");
+	my $npvip = '';
+	my $rdir1 = ''; 
+	my $rdir2 = '';
+
+	my $useha = ask("Will you be using HA? [y/N] ");
+	if ($useha =~ /^y/i) {
+		$npvip  = ask("Enter the virtual IP address for this NetPass cluster: ");
+		$redir1 = ask("Enter the DNS name (or IP address) for the primary redirector: ");
+		$redir2 = ask("Enter the DNS name (or IP address) for the primary redirector (hit enter if you only have one redirector): ");
+		$R->{'npvip'}  = $npvip;
+		$R->{'redir1'} = $redir1;
+		$R->{'redir2'} = $redir2;
+	}
 
 	my $myip = getMyIP("eth0");
 
@@ -1326,9 +1338,12 @@
 
 	# redirectors
 
-	#$rv = lsystem(qq{insert into db values "('npr1-d.cit.buffalo.edu', '%', '$u', 'Y','N','N','N','N','N','N','N','N','N','N','N')" | mysql -fu $u $p mysql});
-
-	#$rv = lsystem(qq{insert into user values "('npr1-d.cit.buffalo.edu', '$u', '$p','y','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','','','','',0,0,0)" | mysql -fu $u $p mysql});
+	foreach my $rd ($R->{'redir1'}, $R->{'redir2'}) {
+		$rv = lsystem(qq{insert into db values "('$rd', '%', '$u', 'Y','N','N','N','N','N','N','N','N','N','N','N')" | mysql -fu $u $p mysql});
+		ldie "failed to add $rd to mysql:db table ($rv)" if $rv;
+		$rv = lsystem(qq{insert into user values "('$rd', '$u', '$p','y','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','n','','','','',0,0,0)" | mysql -fu $u $p mysql});
+		ldie "failed to add $rd to mysql:user table ($rv)" if $rv;
+	}
 
 }
 

Index: MANIFEST
===================================================================
RCS file: /cvsroot/netpass/NetPass/MANIFEST,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- MANIFEST	8 May 2005 02:35:45 -0000	1.40
+++ MANIFEST	17 May 2005 02:57:35 -0000	1.41
@@ -63,6 +63,7 @@
 doc/npsnort.txt
 doc/netpass-install.sxw
 doc/snort-2.3.3-vlan.patch
+doc/netpass-install.html
 etc/netpass-example.conf
 etc/oui.txt
 install.d/logrotate.d/apache