Changeset 417 for trunk/cgi-bin/IPDB.pm

Timestamp:

06/30/10 17:48:03 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Rearrangements and tweaks toward releaseability:

• Add Makefile to install halfway-sanely
• Add .spec file
• Shuffle "use IPDB;" and "use MyIPDB;" lines so that we can automagically insert a suitable "use lib..." line during 'make install'
• Check copyright statements
• Clear up some defaults, and place a number of "constants" in IPDB/MyIPDB rather than having them hardcoded all over the place (Still need to think of a sane way to do this for ipdb.psql's alloctype preseeding)
• Tweak $VERSION identifier in IPDB.pm so it can be defined in the Makefile
• Clean up some dangling bits from repository history conversion, remove unneeded "use ..." statements
• Tweak rWHOIS export script to use more globals and "constants" from (My)IPDB.pm, and more Perl internals than system()-equivalents. Add a few fixme comments for longer-term flexibility improvements.

File:

• trunk/cgi-bin/IPDB.pm (modified) (7 diffs)

trunk/cgi-bin/IPDB.pm

@@ -7 +7 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2004-2006 - Kris Deugau
+# Copyright (C) 2004-2010 - Kris Deugau
 
 package IPDB;
@@ -20 +20 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
-$VERSION        = 2.6;
+$VERSION        = 2; ##VERSION##
 @ISA            = qw(Exporter);
 @EXPORT_OK    = qw(
@@ -53 +53 @@
 our %IPDBacl;
 
-our $orgname = 'Example Corp';
+our $org_name = 'Example Corp';
 our $smtphost = 'smtp.example.com';
 our $domain = 'example.com';
+our $defcustid = '5554242';
+# mostly for rwhois
+##fixme:  leave these blank by default?
+our $org_street = '123 4th Street';
+our $org_city = 'Anytown';
+our $org_prov_state = 'ON';
+our $org_pocode = 'H0H 0H0';
+our $org_country = 'CA';
+our $org_phone = '000-555-1234';
+our $org_techhandle = 'ISP-ARIN-HANDLE';
+
+our $syslog_facility = 'local2';
 
 # Let's initialize the globals.
@@ -561 +573 @@
     # have to insert all pool IPs into poolips table as "unallocated".
     $sth = $dbh->prepare("insert into poolips (pool,ip,custid,city,type)".
-        " values ('$pool', ?, '6750400', '$city', '$type')");
+        " values ('$pool', ?, '$defcustid', '$city', '$type')");
     my @poolip_list = $pool->hostenum;
     if ($class eq 'all') { # (DSL-ish block - *all* IPs available
@@ -618 +630 @@
     eval {
       $msg = "Unable to deallocate $disp_alloctypes{$type} $cidr";
-      $sth = $dbh->prepare("update poolips set custid='6750400',available='y',".
+      $sth = $dbh->prepare("update poolips set custid='$defcustid',available='y',".
         "city=(select city from allocations where cidr >>= '$cidr'".
         " order by masklen(cidr) desc limit 1),".
@@ -716 +728 @@
 ##TEMP
   # We've already deleted the block, now we have to stuff its IPs into the pool.
-  my $sth2 = $dbh->prepare("insert into poolips values ('209.91.185.0/24',?,'6750400','Sudbury','di','y','','','')");
+  my $sth2 = $dbh->prepare("insert into poolips values ('209.91.185.0/24',?,'$defcustid','Sudbury','di','y','','','')");
   $sth2->execute($cidr->addr);
   foreach my $ip ($cidr->hostenum) {
@@ -849 +861 @@
         "Subject: {IPDB} $subj\n",
         "X-Mailer: IPDB Notify v".sprintf("%.1d",$IPDB::VERSION)."\n",
-        "Organization: $orgname\n",
+        "Organization: $org_name\n",
         "\n$message\n");
   }