Changeset 417 for trunk/cgi-bin/consistency-check.pl

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/consistency-check.pl (modified) (2 diffs)

trunk/cgi-bin/consistency-check.pl

@@ -8 +8 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2004 - Kris Deugau
+# Copyright (C) 2004-2010 - Kris Deugau
 
 use DBI;
+use NetAddr::IP;
+
+# don't remove!  required for GNU/FHS-ish install from tarball
+##uselib##
+
 use MyIPDB;
-use NetAddr::IP;
 
 print "Content-type: text/plain\n\n";
@@ -230 +234 @@
 print "Checking for customer blocks with 'bad' CustIDs:\n";
 # Make sure cn-type ("customer netblock") blocks have "real" CustIDs.
-$sth = $dbh->prepare("select cidr,type,custid from allocations where type='cn' and (custid='6750400' or custid='STAFF') order by cidr");
+$sth = $dbh->prepare("select cidr,type,custid from allocations where type='cn' and (custid='$IPDB::defcustid' or custid='STAFF') order by cidr");
 $sth->execute;
 while (@data = $sth->fetchrow_array) {