Index: /trunk/Makefile
===================================================================
--- /trunk/Makefile (revision 165)
+++ /trunk/Makefile (revision 166)
@@ -1,7 +1,7 @@
-# $Id$
+# $Id: Makefile 417 2010-06-30 21:48:03Z kdeugau $
# DNS Admin makefile
PKGNAME=dnsadmin
-VERSION=0
+VERSION=1.0
RELEASE=1
@@ -31,28 +31,23 @@
INSTALL COPYING TODO Makefile dnsadmin.spec new-dns.sql dns.sql dns.cgi DNSDB.pm \
\
- index.shtml
+ index.shtml \
\
images/trash2.png images/fwd.png images/ffwd.png images/frev.png \
images/rev.png images/DESC.png images/ASC.png \
\
- templates/fpnla.tmpl templates/updatesoa.tmpl templates/log.tmpl templates/newgrp.tmpl \
- templates/lettsearch.tmpl templates/delgrp.tmpl templates/deldom.tmpl templates/footer.tmpl \
- templates/header.tmpl templates/reclist.tmpl templates/adddomain.tmpl templates/deluser.tmpl \
- templates/editsoa.tmpl templates/pgcount.tmpl templates/dns.css templates/dnsq.tmpl \
- templates/grptree.tmpl templates/addgroup.tmpl templates/useradmin.tmpl templates/addrec.tmpl \
- templates/login.tmpl templates/adduser.tmpl templates/sbox.tmpl templates/record.tmpl \
- templates/whoisq.tmpl templates/domlist.tmpl templates/menu.tmpl \
- templates/soadata.tmpl templates/newdomain.tmpl templates/grpman.tmpl templates/axfr.tmpl \
- templates/newuser.tmpl templates/delrec.tmpl
+ templates/adddomain.tmpl templates/addgroup.tmpl templates/addrec.tmpl templates/adduser.tmpl \
+ templates/axfr.tmpl templates/bulkchange.tmpl templates/bulkdomain.tmpl templates/dberr.tmpl \
+ templates/deldom.tmpl templates/delgrp.tmpl templates/delrec.tmpl templates/deluser.tmpl \
+ templates/dns.css templates/dnsq.tmpl templates/domlist.tmpl templates/edgroup.tmpl \
+ templates/editsoa.tmpl templates/footer.tmpl templates/fpnla.tmpl templates/grouptree.css \
+ templates/grouptree-ie.css templates/grpman.tmpl templates/grptree.tmpl templates/header.tmpl \
+ templates/lettsearch.tmpl templates/login.tmpl templates/log.tmpl templates/menu.tmpl \
+ templates/newdomain.tmpl templates/newgrp.tmpl templates/permlist_enabled.tmpl templates/permlist.tmpl \
+ templates/pgcount.tmpl templates/reclist.tmpl templates/record.tmpl templates/sbox.tmpl \
+ templates/soadata.tmpl templates/template.tmpl templates/updatesoa.tmpl templates/useradmin.tmpl \
+ templates/user.tmpl templates/viadns.css templates/whoisq.tmpl \
DIRS = \
images templates
-
-##work
-HTML = \
- addmaster.html alloctypes.html assign.html changes.html compsearch.html \
- confirm.html confirmRemove.html editDisplay.html fb-assign.html footer.inc \
- header.inc help.html index.shtml ipdb.css local.css \
- newcity.html newnode.html nodesearch.html startsn.html updated.html
IMAGES = images/logo.png
@@ -64,5 +59,5 @@
cgi-bin/search.cgi cgi-bin/consistency-check.pl
-MODULES = cgi-bin/IPDB.pm
+MODULES = DNSDB.pm
CONFIGMODULES = cgi-bin/MyIPDB.pm cgi-bin/CustIDCK.pm
@@ -73,17 +68,17 @@
install:
@for i in $(HTML) $(IMAGES); do \
- $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/ipdb/$$i ; \
+ $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/dnsdb/$$i ; \
done
# munge in necessary 'use lib ...' bits so scripts can find MyIPDB.pm...
@for i in $(SCRIPTS) $(MODULES); do \
- $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${libdir}/ipdb/$$i ; \
- perl -pi -e 's|##uselib##|use lib "${sysconfdir}/ipdb/";|;' $(DESTDIR)${libdir}/ipdb/$$i ; \
+ $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${libdir}/dnsdb/$$i ; \
+ perl -pi -e 's|##uselib##|use lib "${sysconfdir}/dnsdb/";|;' $(DESTDIR)${libdir}/dnsdb/$$i ; \
done
- $(INSTALL) -d $(DESTDIR)${sysconfdir}/ipdb/
+ $(INSTALL) -d $(DESTDIR)${sysconfdir}/dnsdb/
@for i in $(CONFIGMODULES) ; do \
- $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/ipdb/ ; \
+ $(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}/ipdb";|;' $(DESTDIR)${sysconfdir}/ipdb/MyIPDB.pm
+# perl -pi -e 's|##uselib##|use lib "${libdir}/dnsdb";|;' $(DESTDIR)${sysconfdir}/ipdb/MyIPDB.pm
#clean:
@@ -102,105 +97,2 @@
rm -rf $(PKGNAME)-$(VERSION)
# gpg --detach-sign $(PKGNAME)-$(VERSION).tar.gz
-# $Id: Makefile 417 2010-06-30 21:48:03Z kdeugau $
-# DNS Admin makefile
-
-PKGNAME=dnsadmin
-VERSION=0
-RELEASE=1
-
-# Include some boilerplate Gnu makefile definitions.
-prefix = /usr/local
-
-exec_prefix = ${prefix}
-bindir = ${exec_prefix}/bin
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
-includedir = ${prefix}/include
-datadir = ${prefix}/share
-localedir = $(datadir)/locale
-sysconfdir = ${prefix}/etc
-mandir = ${prefix}/man
-
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALLMODE= -m 0755
-INSTALLMODE2 = -m 0555
-
-DESTDIR =
-
-MANIFEST = \
- INSTALL COPYING TODO Makefile dnsadmin.spec new-dns.sql dns.sql dns.cgi DNSDB.pm \
- \
- index.shtml
- \
- images/trash2.png images/fwd.png images/ffwd.png images/frev.png \
- images/rev.png images/DESC.png images/ASC.png \
- \
- templates/fpnla.tmpl templates/updatesoa.tmpl templates/log.tmpl templates/newgrp.tmpl \
- templates/lettsearch.tmpl templates/delgrp.tmpl templates/deldom.tmpl templates/footer.tmpl \
- templates/header.tmpl templates/reclist.tmpl templates/adddomain.tmpl templates/deluser.tmpl \
- templates/editsoa.tmpl templates/pgcount.tmpl templates/dns.css templates/dnsq.tmpl \
- templates/grptree.tmpl templates/addgroup.tmpl templates/useradmin.tmpl templates/addrec.tmpl \
- templates/login.tmpl templates/adduser.tmpl templates/sbox.tmpl templates/record.tmpl \
- templates/whoisq.tmpl templates/domlist.tmpl templates/menu.tmpl \
- templates/soadata.tmpl templates/newdomain.tmpl templates/grpman.tmpl templates/axfr.tmpl \
- templates/newuser.tmpl templates/delrec.tmpl
-
-DIRS = \
- images templates
-
-##work
-HTML = \
- addmaster.html alloctypes.html assign.html changes.html compsearch.html \
- confirm.html confirmRemove.html editDisplay.html fb-assign.html footer.inc \
- header.inc help.html index.shtml ipdb.css local.css \
- newcity.html newnode.html nodesearch.html startsn.html updated.html
-
-IMAGES = images/logo.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
-
-MODULES = cgi-bin/IPDB.pm
-
-CONFIGMODULES = cgi-bin/MyIPDB.pm cgi-bin/CustIDCK.pm
-
-all:
- # nullop
-
-install:
- @for i in $(HTML) $(IMAGES); do \
- $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/ipdb/$$i ; \
- done
- # munge in necessary 'use lib ...' bits so scripts can find MyIPDB.pm...
- @for i in $(SCRIPTS) $(MODULES); do \
- $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${libdir}/ipdb/$$i ; \
- perl -pi -e 's|##uselib##|use lib "${sysconfdir}/ipdb/";|;' $(DESTDIR)${libdir}/ipdb/$$i ; \
- done
- $(INSTALL) -d $(DESTDIR)${sysconfdir}/ipdb/
- @for i in $(CONFIGMODULES) ; do \
- $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/ipdb/ ; \
- done
-# # and now munge MyIPDB.pm so it can find the core library
-# perl -pi -e 's|##uselib##|use lib "${libdir}/ipdb";|;' $(DESTDIR)${sysconfdir}/ipdb/MyIPDB.pm
-
-#clean:
-# @for i in $(DIRS) ; do \
-# $(MAKE) -C $$i clean ; \
-# done
-
-dist:
- mkdir $(PKGNAME)-$(VERSION)
- tar cf - $(MANIFEST) | (cd $(PKGNAME)-$(VERSION); tar xf -)
- /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
- tar cf $(PKGNAME)-$(VERSION).tar $(PKGNAME)-$(VERSION)
- gzip -v -f -9 $(PKGNAME)-$(VERSION).tar
- rm -rf $(PKGNAME)-$(VERSION)
- # gpg --detach-sign $(PKGNAME)-$(VERSION).tar.gz
Index: /trunk/dns.cgi
===================================================================
--- /trunk/dns.cgi (revision 165)
+++ /trunk/dns.cgi (revision 166)
@@ -1427,7 +1427,9 @@
}
-print "\n";
-foreach (@debugbits) { print; }
-print "\n";
+if (@debugbits) {
+ print "\n";
+ foreach (@debugbits) { print; }
+ print "\n";
+}
# spit it out
Index: /trunk/templates/bulkdomain.tmpl
===================================================================
--- /trunk/templates/bulkdomain.tmpl (revision 165)
+++ /trunk/templates/bulkdomain.tmpl (revision 166)
@@ -40,5 +40,5 @@
+
+
+
-
-
-
-
Index: /trunk/templates/dns.css
===================================================================
--- /trunk/templates/dns.css (revision 165)
+++ /trunk/templates/dns.css (revision 166)
@@ -106,5 +106,5 @@
white-space: nowrap;
border: thin solid #000000;
- background-color: #ffccee;
+ background-color: #f0f0f0;
vertical-align: top;
}
@@ -203,13 +203,8 @@
-#header {
- border-bottom: thin solid #000000;
- clear: both;
- float: left;
- width: 100%;
-}
#footer {
border-top: thin solid #000000;
clear: both;
+ margin-top: 20px;
}
#contact {
@@ -224,7 +219,8 @@
float: right;
width: 100%;
+ margin:bottom: 50px;
}
#login {
- margin: 50px auto;
+ margin: 17% auto;
padding: 3px;
border: thin solid #000000;
Index: /trunk/templates/footer.tmpl
===================================================================
--- /trunk/templates/footer.tmpl (revision 165)
+++ /trunk/templates/footer.tmpl (revision 166)
@@ -3,5 +3,7 @@