Changeset 199

Timestamp:

12/13/11 15:05:26 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Cleanup:

• Indicate that add is the default method for vega-import.pl
• Add replace tag in DNSDB.pm for correct version number
• Clean up Makefile MANIFEST and processing to remove lingering copy-paste-isms

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• Makefile (modified) (5 diffs)
• vega-import.pl (modified) (1 diff)

trunk/DNSDB.pm

@@ -22 +22 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
-$VERSION        = 0.1;
+$VERSION        = 0.1;    ##VERSION##
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(

trunk/Makefile

@@ -29 +29 @@
 
 MANIFEST = \
-        INSTALL COPYING TODO Makefile dnsadmin.spec new-dns.sql dns.sql dns.cgi DNSDB.pm \
+        INSTALL COPYING TODO Makefile new-dns.sql dns.sql dns.cgi dns-rpc.cgi DNSDB.pm \
+        vega-import.pl \
         \
         index.shtml \
@@ -51 +52 @@
         images templates
 
-IMAGES = images/logo.png
+IMAGES = \
+        images/trash2.png images/fwd.png images/ffwd.png images/frev.png \
+        images/rev.png images/DESC.png images/ASC.png
 
 SCRIPTS = \
-        cgi-bin/extras/db2rwhois.pl cgi-bin/combineblocks.pl cgi-bin/access-pwd-update.pl \
-        cgi-bin/newnode.cgi cgi-bin/freespace.pl cgi-bin/admin.cgi \
-        cgi-bin/main.cgi cgi-bin/newcity.cgi cgi-bin/allocate.pl \
-        cgi-bin/search.cgi cgi-bin/consistency-check.pl
+        dns.cgi dns-rpc.cgi vega-import.pl
 
 MODULES = DNSDB.pm
 
-CONFIGMODULES = cgi-bin/MyIPDB.pm cgi-bin/CustIDCK.pm
+#CONFIGMODULES = MyDNSDB.pm
 
 all:
@@ -70 +70 @@
                 $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/dnsdb/$$i ; \
         done
-        # munge in necessary 'use lib ...' bits so scripts can find MyIPDB.pm...
+        # munge in necessary 'use lib ...' bits so scripts can find MyDNSDB.pm...
         @for i in $(SCRIPTS) $(MODULES); do \
                 $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${libdir}/dnsdb/$$i ; \
@@ -79 +79 @@
                 $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/dnsdb/ ; \
         done
-#       # and now munge MyIPDB.pm so it can find the core library
-#       perl -pi -e 's|##uselib##|use lib "${libdir}/dnsdb";|;' $(DESTDIR)${sysconfdir}/ipdb/MyIPDB.pm
+#       # and now munge MyDNSDB.pm so it can find the core library
+#       perl -pi -e 's|##uselib##|use lib "${libdir}/dnsdb";|;' $(DESTDIR)${sysconfdir}/dnsdb/MyDNSDB.pm
 
 #clean:
@@ -92 +92 @@
         #/usr/bin/perl -p -e 's/#VERSION#/$(VERSION)/;s/#RELEASE#/$(RELEASE)/;s/#BETA#//g' < $(PKGNAME).spec > $(PKGNAME)-$(VERSION)/$(PKGNAME).spec
         /usr/bin/perl -p -e 's/#VERSION#/$(VERSION)/;s/#RELEASE#/$(RELEASE)/;s/#BETA#//g' < INSTALL > $(PKGNAME)-$(VERSION)/INSTALL
-        perl -pi -e 's/[\d.]+;\s*##VERSION##/$(VERSION);/;' $(PKGNAME)-$(VERSION)/cgi-bin/IPDB.pm
+        perl -pi -e 's/[\d.]+;\s*##VERSION##/$(VERSION);/;' $(PKGNAME)-$(VERSION)/DNSDB.pm
         tar cf $(PKGNAME)-$(VERSION).tar $(PKGNAME)-$(VERSION)
         gzip -v -f -9 $(PKGNAME)-$(VERSION).tar

trunk/vega-import.pl

@@ -24 +24 @@
 if ($ARGV[0] && $ARGV[0] !~ /^(add|replace)$/) {
   die "Usage:  vega-import.pl [add|replace]\n".
-        "       add      Import VegaDNS data as a subgroup of the default root group\n".
+        "       add      Import VegaDNS data as a subgroup of the default root group (default)\n".
         "       replace  Wipe all existing data and import VegaDNS data into the root group\n";
 }