Changeset 216 for trunk

Timestamp:

01/04/12 23:25:56 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Found some not-so-little things missing for a tarball

• munging of @INC via "use lib" needs to be pointed to the right path on install
• session dir should be configurable (eg, to put it in /var/lib/dnsdb when packaged scripts + templates all go in /usr/share/dnsdb)
• Finally remove lingering unused viadns.css
• Remember to install template files on 'make install'
• Get a good start on filling out INSTALL halfway properly by copy-pasting the IPDB version
• Add all-commented example config file to be installed

Location:

trunk

Files:

• DNSDB.pm (modified) (2 diffs)
• Makefile (modified) (4 diffs)
• dns-rpc.cgi (modified) (2 diffs)
• dns.cgi (modified) (3 diffs)
• dnsdb.conf (added)
• templates/viadns.css (deleted)

trunk/DNSDB.pm

@@ -120 +120 @@
 # fmeh.  this is a real web path, not a logical internal one.  hm..
 #               cssdir  => 'templates/',
+                sessiondir      => 'session/',
 
                 # Session params
@@ -223 +224 @@
       $config{domain}           = $1 if /^domain\s*=\s*([a-z0-9_.-]+)/i;
       # session - note this is fed directly to CGI::Session
-      $config{timeout}  = $1 if /^[tT][iI][mM][eE][oO][uU][tT]\s*=\s*(\d+[smhdwMy]?)/;
+      $config{timeout}          = $1 if /^[tT][iI][mM][eE][oO][uU][tT]\s*=\s*(\d+[smhdwMy]?)/;
+      $config{sessiondir}       = $1 if m{^sessiondir\s*=\s*([a-z0-9/_.-]+)}i;
       # misc
       $config{log_failures}     = $1 if /^log_failures\s*=\s*([a-z01]+)/i;

trunk/Makefile

@@ -47 +47 @@
         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 \
+        templates/user.tmpl templates/whoisq.tmpl \
+        \
+        dnsdb.conf
 
 DIRS = \
@@ -61 +63 @@
 MODULES = DNSDB.pm
 
-#CONFIGMODULES = MyDNSDB.pm
+TEMPLATES = \
+        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/whoisq.tmpl
+
+CONFIGFILES = dnsdb.conf
 
 all:
@@ -67 +82 @@
 
 install:
-        @for i in $(HTML) $(IMAGES); do \
-                $(INSTALL_DATA) -D $$i $(DESTDIR)${libdir}/dnsdb/$$i ; \
+        @for i in $(IMAGES) $(TEMPLATES); do \
+                $(INSTALL_DATA) -D $$i $(DESTDIR)${datadir}/dnsdb-$(VERSION)/$$i ; \
         done
-        # munge in necessary 'use lib ...' bits so scripts can find MyDNSDB.pm...
+        @# munge in necessary 'use lib ...' bits so scripts can find libs and config...
+        @# datadir is correct;  no arch-specific files
         @for i in $(SCRIPTS) $(MODULES); do \
-                $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${libdir}/dnsdb/$$i ; \
-                perl -pi -e 's|##uselib##|use lib "${sysconfdir}/dnsdb/";|;' $(DESTDIR)${libdir}/dnsdb/$$i ; \
+                $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${datadir}/dnsdb-$(VERSION)/$$i ; \
+                perl -pi -e 's|use lib '.';     ##uselib##|use lib "${datadir}/dnsdb-$(VERSION)/";|;' $(DESTDIR)${datadir}/dnsdb-$(VERSION)/$$i ; \
+                perl -pi -e 's|use lib '.';     ##uselib##|use lib "${datadir}/dnsdb-$(VERSION)/";|;' $(DESTDIR)${datadir}/dnsdb-$(VERSION)/$$i ; \
         done
-        $(INSTALL) -d $(DESTDIR)${sysconfdir}/dnsdb/
-        @for i in $(CONFIGMODULES) ; do \
-                $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/dnsdb/ ; \
+        @$(INSTALL) -d $(DESTDIR)${sysconfdir}/dnsdb/
+        @# install an example config file with all known settings
+        @for i in $(CONFIGFILES) ; do \
+                if [ -e $(DESTDIR)${sysconfdir}/dnsdb/$$i ]; then \
+                        echo "refusing to overwrite existing config file, created as $$i.new" ; \
+                        $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/dnsdb/$$i.new ; \
+                else \
+                        $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/dnsdb/ ; \
+                fi \
         done
 #       # and now munge MyDNSDB.pm so it can find the core library
@@ -96 +119 @@
         gzip -v -f -9 $(PKGNAME)-$(VERSION).tar
         rm -rf $(PKGNAME)-$(VERSION)
-        # gpg --detach-sign $(PKGNAME)-$(VERSION).tar.gz
+        gpg --detach-sign $(PKGNAME)-$(VERSION).tar.gz

trunk/dns-rpc.cgi

@@ -1 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w -T
 # $Id$
 # XMLRPC interface to manipulate most DNS DB entities
@@ -6 +6 @@
 use strict;
 use warnings;
+
+# don't remove!  required for GNU/FHS-ish install from tarball
+use lib '.';    ##uselib##
+
 use DNSDB;      # note we're not importing subs;  this lets us (ab)use the same sub names here for convenience
 use Data::Dumper;

trunk/dns.cgi

@@ -32 +32 @@
 #die "argh! \@INC got tainted!" if is_tainted(@INC);
 
-# custom modules
-use lib '.';
+# don't remove!  required for GNU/FHS-ish install from tarball
+use lib '.';    ##uselib##
+
 use DNSDB qw(:ALL);
 
@@ -41 +42 @@
 # Let's do these templates right...
 my $templatedir = "templates";
-my $sessiondir = "session";
 
 # Set up the CGI object...
@@ -64 +64 @@
 # persistent stuff needed on most/all pages
 my $sid = ($webvar{sid} ? $webvar{sid} : undef);
-my $session = new CGI::Session("driver:File", $sid, {Directory => $sessiondir})
+my $session = new CGI::Session("driver:File", $sid, {Directory => $config{sessiondir}})
         or die CGI::Session->errstr();
 #$sid = $session->id() if !$sid;