Changeset 417 for trunk/cgi-bin/extras

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/extras/db2rwhois.pl (modified) (9 diffs)

trunk/cgi-bin/extras/db2rwhois.pl

@@ -10 +10 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2004-2007 - Kris Deugau
+# Copyright (C) 2004-2010 - Kris Deugau
 
 use strict;
@@ -16 +16 @@
 use DBI;
 use NetAddr::IP;
+use File::Path 'rmtree';
+use POSIX qw(strftime);
+
+# don't remove!  required for GNU/FHS-ish install from tarball
+##uselib##
+
 use MyIPDB;
-use File::Path 'rmtree';
-
-$ENV{"PATH"} = "/bin;/usr/bin";
+
+#$ENV{"PATH"} = "/bin;/usr/bin";
 
 my $rwhoisDataPath = "/etc/rwhoisd";
@@ -91 +96 @@
   print "$masterblocks[$i] $ctime $mtime\n";
 
-  my $date;
-  chomp ($date = `/bin/date +"%Y-%m-%d"`);
+  my $date = strftime("%Y-%m-%d", localtime);
 
   my $rwnet = "net-".$masterblocks[$i]->addr."-".$masterblocks[$i]->masklen;
@@ -111 +115 @@
     mkdir "$netdatadir/data/referral";
 
-    my $serial;
-    chomp ($serial = `/bin/date '+%Y%m%d'000000000`);
-
+    my $serial = strftime("%Y%m%d%H%M%S000", localtime);
+
+##fixme: SOA should be different every time data changes, therefore need to rewrite this ~~ every export :(
     print "  Creating SOA...\n";
     open SOAFILE, ">$netdatadir/soa";
@@ -147 +151 @@
 
     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/ };
 
+##fixme: not sure if this is even necessary, since it's not referenced anywhere I can recall...
     print "  Creating org data...\n";
-    open ORGDATAFILE, ">$netdatadir/data/org/friendlyisp.txt";
+    open ORGDATAFILE, ">$netdatadir/data/org/ourorg.txt";
     print ORGDATAFILE qq(ID: NETBLK-ISP.$masterblocks[$i]
 Auth-Area: $masterblocks[$i]
-Org-Name: Friendly ISP
-Street-Address: 123 4th Street
-City: Anytown
-State: ON
-Postal-Code: H0H 0H0
-Country-Code: CA
-Phone: 000-555-1234
+Org-Name: $IPDB::org_name
+Street-Address: $IPDB::org_street
+City: $IPDB::org_city
+State: $IPDB::org_prov_state
+Postal-Code: $IPDB::org_pocode
+Country-Code: $IPDB::org_country
+Phone: $IPDB::org_phone
 Created: 20040308
 Updated: 20040308
@@ -189 +195 @@
         "IP-Network: $masterblocks[$i]\n".
         "IP-Network-Block: ".$masterblocks[$i]->range."\n".
-        "Org-Name: Friendly ISP\n".
-        "Street-Address: 123 4th Street\n".
-        "City: Anytown\n".
-        "StateProv: Ontario\n".
-        "Postal-Code: H0H 0H0\n".
-        "Country-Code: CA\n".
-        "Tech-Contact: ISP-ARIN-HANDLE\n".
+        "Org-Name: $IPDB::org_name\n".
+        "Street-Address: $IPDB::org_street\n".
+        "City: $IPDB::org_city\n".
+        "StateProv: $IPDB::org_prov_state\n".
+        "Postal-Code: $IPDB::org_pocode\n".
+        "Country-Code: $IPDB::org_country\n".
+        "Tech-Contact: $IPDB::org_techhandle\n".
         "Created: $ctime\n".
         "Updated: $mtime\n".
@@ -226 +232 @@
 
 # Fill in a generic entry for nameless allocations
-if ($desc =~ /^\s*$/) { $desc = 'Friendly ISP'; }
+if ($desc =~ /^\s*$/) { $desc = $IPDB::org_name; }
 
     # Fix up datestamps.  We don't *really* need sub-microsecond resolution on our exports...
@@ -257 +263 @@
         "IP-Network: $net\n".
         "IP-Network-Block: ".$net->range."\n".
-        "Org-Name: Friendly ISP\n".
-        "Street-Address: 123 4th Street\n".
-        "City: Anytown\n".
-        "StateProv: Ontario\n".
-        "Postal-Code: H0H 0H0\n".
-        "Country-Code: CA\n".
-        "Tech-Contact: ISP-ARIN-HANDLE\n".
+        "Org-Name: $IPDB::org_name\n".
+        "Street-Address: $IPDB::org_street\n".
+        "City: $IPDB::org_city\n".
+        "StateProv: $IPDB::org_prov_state\n".
+        "Postal-Code: $IPDB::org_pocode\n".
+        "Country-Code: $IPDB::org_country\n".
+        "Tech-Contact: $IPDB::org_techhandle\n".
         "Created: $ctime\n".
         "Updated: $mtime\n".
@@ -281 +287 @@
         "IP-Network: $net\n".
         "IP-Network-Block: ".$net->range."\n".
-        "Org-Name: ".($name ? $name : 'Friendly ISP')."\n".
-        "Street-Address: ".($street ? $street : '123 4th Street')."\n".
-        "City: ".($city ? $city : 'Anytown')."\n".
-        "StateProv: ".($prov ? $prov : 'Ontario')."\n".
-        "Postal-Code: ".($pocode ? $pocode : 'H0H 0H0')."\n".
-        "Country-Code: ".($country ? $country : 'CA')."\n".
-        "Tech-Contact: ".($tech ? $tech : 'ISP-ARIN-HANDLE')."\n".
+        "Org-Name: ".($name ? $name : $IPDB::org_name)."\n".
+        "Street-Address: ".($street ? $street : $IPDB::org_street)."\n".
+        "City: ".($city ? $city : $IPDB::org_city)."\n".
+        "StateProv: ".($prov ? $prov : $IPDB::org_prov_state)."\n".
+        "Postal-Code: ".($pocode ? $pocode : $IPDB::org_pocode)."\n".
+        "Country-Code: ".($country ? $country : $IPDB::org_country)."\n".
+        "Tech-Contact: ".($tech ? $tech : $IPDB::org_techhandle)."\n".
         "Created: $ctime\n".
         "Updated: $mtime\n".