Changeset 219 for trunk

Timestamp:

01/13/12 18:11:38 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Add some nifty bits to allow packaged or install-via-make-install
setups to keep multiple versions, same as the run-from-the-tarball
Add .spec file

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• INSTALL (modified) (2 diffs)
• Makefile (modified) (3 diffs)
• dnsadmin.spec (added)

trunk/DNSDB.pm

@@ -147 +147 @@
   my $deferr = '';      # place to put error from default config file in case we can't find either one
 
-  my $configroot = '/etc/dnsdb';
+  my $configroot = "/etc/dnsdb";        ##CFG_LEAF##
   $configroot = '' if $basename =~ m|^/|;
   $basename .= ".conf" if $basename !~ /\.conf$/;

trunk/INSTALL

@@ -27 +27 @@
     - NetAddr::IP >= 4.x.  3.x may work, however 4.x has been out for
       more than 4 years.
+    - Frontier::Responder (only required if using dns-rpc.cgi)
 - tinydns - support for other DNS server software is planned
 
@@ -69 +70 @@
 shell> psql -U dnsdb dnsdb <dns.sql
 
-
-##work
 4) Configure your webserver to call the DNS Administrator scripts
-at an appropriate web path.  A webroot pointing to the HTML files
-(first level under the dnsadmin-#VERSION#/ tarball directory, or
-/usr/local/lib/dnsadmin-#VERSION#) should work fine;  a server
-alias under an existing virtual host should work as well.
+at an appropriate web path.  A webroot pointing to the unpacked tarball
+directory or the default install location /usr/local/lib/dnsadmin-#VERSION#
+should work fine;  a directory alias under an existing virtual host should
+work as well.
 
 The directory containing the HTML and scripts must have at least the

trunk/Makefile

@@ -28 +28 @@
 DESTDIR =
 
+# flag to indicate if we install in a version-numbered location to
+# support parallel installs (packaged or otherwise) or if we're
+# installing to .../dnsdb/ (overwrite whatever was there last)
+PARA_VERSIONS = 0
+
+# also set the leaf directories we'll be putting things in
+PKG_LEAF = "dnsdb"
+CFG_LEAF = "dnsdb"
+
+# tweak the final leaf directories we install to if PARA_VERSIONS is set
+ifeq "$(PARA_VERSIONS)" "1"
+PKG_LEAF = "dnsdb-$(VERSION)"
+CFG_LEAF = "dnsdb/$(VERSION)"
+endif
+
 MANIFEST = \
-        INSTALL COPYING TODO Makefile new-dns.sql dns.sql dns.cgi dns-rpc.cgi DNSDB.pm \
-        vega-import.pl \
+        INSTALL COPYING TODO Makefile dnsadmin.spec \
+        \
+        new-dns.sql dns.sql dns.cgi dns-rpc.cgi DNSDB.pm vega-import.pl \
         \
         index.shtml \
@@ -83 +99 @@
 install:
         @for i in $(IMAGES) $(TEMPLATES); do \
-                $(INSTALL_DATA) -D $$i $(DESTDIR)${datadir}/dnsdb-$(VERSION)/$$i ; \
+                $(INSTALL_DATA) -D $$i $(DESTDIR)${datadir}/$(PKG_LEAF)/$$i ; \
         done
         @# 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)${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 ; \
+                $(INSTALL_SCRIPT) -D $$i $(DESTDIR)${datadir}/$(PKG_LEAF)/$$i ; \
+                perl -pi -e 's|use lib '.';     ##uselib##|use lib "${datadir}/$(PKG_LEAF)/";|;' $(DESTDIR)${datadir}/$(PKG_LEAF)/$$i ; \
+                perl -pi -e 's|use lib '.';     ##uselib##|use lib "${datadir}/$(PKG_LEAF)/";|;' $(DESTDIR)${datadir}/$(PKG_LEAF)/$$i ; \
         done
-        @$(INSTALL) -d $(DESTDIR)${sysconfdir}/dnsdb/
+        @$(INSTALL) -d $(DESTDIR)${sysconfdir}/$(CFG_LEAF)/
         @# install an example config file with all known settings
         @for i in $(CONFIGFILES) ; do \
-                if [ -e $(DESTDIR)${sysconfdir}/dnsdb/$$i ]; then \
+                if [ -e $(DESTDIR)${sysconfdir}/$(CFG_LEAF)/$$i ]; then \
                         echo "refusing to overwrite existing config file, created as $$i.new" ; \
-                        $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/dnsdb/$$i.new ; \
+                        $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/$(CFG_LEAF)/$$i.new ; \
                 else \
-                        $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/dnsdb/ ; \
-                fi \
+                        $(INSTALL_DATA) $$i $(DESTDIR)${sysconfdir}/$(CFG_LEAF)/ ; \
+                fi ; \
+                perl -pi -e 's|"/etc/dnsdb";    ##CFG_LEAF##|"${sysconfdir}/$(CFG_LEAF)";|;' $(DESTDIR)${datadir}/$(PKG_LEAF)/DNSDB.pm ; \
         done
 #       # and now munge MyDNSDB.pm so it can find the core library
@@ -113 +130 @@
         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' < $(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)/DNSDB.pm