Changeset 420

Timestamp:

07/04/10 16:01:22 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix dangling $defcustid -> $IPDB::defcustid
Return quietly from mailNotify if there's no recipients
Move rWHOIS data path definition/default into MyIPDB.pm/IPDB.pm respectively

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (2 diffs)
• MyIPDB.pm (modified) (1 diff)
• extras/db2rwhois.pl (modified) (8 diffs)
• main.cgi (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -59 +59 @@
 # mostly for rwhois
 ##fixme:  leave these blank by default?
+our $rwhoisDataPath = '/usr/local/rwhoisd/etc/rwhoisd'; # to match ./configure defaults from rwhoisd-1.5.9.6
 our $org_street = '123 4th Street';
 our $org_city = 'Anytown';
@@ -853 +854 @@
   }
 
+  return if !@reciplist;
+
   foreach my $recip (@reciplist) {
     $mailer->mail("ipdb\@$domain");

trunk/cgi-bin/MyIPDB.pm

@@ -29 +29 @@
 #$IPDB::defcustid = '5554242';
 # Globals for db2rwhois.pl
+#$IPDB::rwhoisDataPath = '/usr/local/rwhoisd/etc/rwhoisd';
 #$IPDB::org_street = '123 4th Street';
 #$IPDB::org_city = 'Anytown';

trunk/cgi-bin/extras/db2rwhois.pl

@@ -26 +26 @@
 #$ENV{"PATH"} = "/bin;/usr/bin";
 
-my $rwhoisDataPath = "/etc/rwhoisd";
-
 my @autharea;
 my $authrw;
 # Use the template file to allow us to keep persistent nodes aside from netblock data
-open AUTHTEMPLATE, "<$rwhoisDataPath/rwhoisd.auth_template";
+open AUTHTEMPLATE, "<$IPDB::rwhoisDataPath/rwhoisd.auth_template";
 my $template_persist;
 while (<AUTHTEMPLATE>) {
@@ -48 +46 @@
 
 # Get the list of live directories for potential deletion
-opendir RWHOISROOT, $rwhoisDataPath;
+opendir RWHOISROOT, $IPDB::rwhoisDataPath;
 my %rwhoisdirs;
 foreach (readdir RWHOISROOT) {
@@ -104 +102 @@
 
 # Hokay.  Gonna do checks *here* to see if we need to create new master trees
-  my $netdatadir = "$rwhoisDataPath/$rwnet";
+  my $netdatadir = "$IPDB::rwhoisDataPath/$rwnet";
   if (! -e $netdatadir) {
     print " New master $masterblocks[$i]!\n";
@@ -152 +150 @@
     print "  Copying template files...\n";
 ##fixme: find a way to do this without a shell (or functional equivalent)
-    qx { /bin/cp $rwhoisDataPath/skel/attribute_defs/* $netdatadir/attribute_defs/ };
+    qx { /bin/cp $IPDB::rwhoisDataPath/skel/attribute_defs/* $netdatadir/attribute_defs/ };
 
 ##fixme: not sure if this is even necessary, since it's not referenced anywhere I can recall...
@@ -188 +186 @@
   my $masterfilename = "$rwnet/data/network/".$masterblocks[$i]->addr."-".$masterblocks[$i]->masklen.".txt";
 
-  open MASTERFILE,">$rwhoisDataPath/$masterfilename";
+  open MASTERFILE,">$IPDB::rwhoisDataPath/$masterfilename";
 
   print MASTERFILE "ID: NETBLK-ISP.$masterblocks[$i]\n".
@@ -310 +308 @@
 foreach my $netdir (keys %rwhoisdirs) {
   print "deleting obsolete directory $netdir...\n";
-  rmtree ( "$rwhoisDataPath/$netdir", { verbose => 1, error => \my $errlist } );
+  rmtree ( "$IPDB::rwhoisDataPath/$netdir", { verbose => 1, error => \my $errlist } );
   for my $diag (@$errlist) {
     my ($file, $message) = each %$diag;
@@ -323 +321 @@
 if ($authrw) {
   print "Regenerating auth_area\n";
-  open RWHOISDAUTH, ">$rwhoisDataPath/rwhoisd.auth_area";
+  open RWHOISDAUTH, ">$IPDB::rwhoisDataPath/rwhoisd.auth_area";
   print RWHOISDAUTH "# WARNING: This file is autogenerated!  Any static nodes should\n".
                 "# be entered in /etc/rwhoisd/rwhoisd.auth_template\n";
@@ -339 +337 @@
 
   # restart/reload rwhoisd
-  if (-e "$rwhoisDataPath/rwhoisd.pid") {       # no pidfile, no restart.
+  if (-e "$IPDB::rwhoisDataPath/rwhoisd.pid") { # no pidfile, no restart.
     print "Restarting rwhoisd\n";
-    open PIDFILE, "<$rwhoisDataPath/rwhoisd.pid";
+    open PIDFILE, "<$IPDB::rwhoisDataPath/rwhoisd.pid";
     my ($rwpid) = (<PIDFILE> =~ /^(\d+)/);
     close PIDFILE;

trunk/cgi-bin/main.cgi

@@ -961 +961 @@
       if (!$status) {
         printError("Customer ID not valid.  Make sure the Customer ID ".
-          "is correct.<br>\nUse STAFF for staff static IPs, and $defcustid for any other ".
+          "is correct.<br>\nUse STAFF for staff static IPs, and $IPDB::defcustid for any other ".
           "non-customer assignments.");
         return;