[Lunar-commits] CVS: moonbase/net/maradns BUILD, 1.2, 1.3 DETAILS, 1.1, 1.2 POST_INSTALL, 1.1, 1.2 POST_REMOVE, 1.2, 1.3 lunar_install.locations, 1.1, 1.2

[Jaime Buffery]

Update of /var/cvs/lunar/moonbase/net/maradns
In directory dbguin.lunar-linux.org:/tmp/cvs-serv18532

Modified Files:
	BUILD DETAILS POST_INSTALL POST_REMOVE lunar_install.locations 
Log Message:
Bumped version, Major cleanup:
* Now the tarball has its own initscript.
* Doesn't ask any questions, and set ups a default config.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/net/maradns/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	30 Jul 2003 23:30:35 -0000	1.2
+++ BUILD	19 Jan 2004 12:58:39 -0000	1.3
@@ -1,7 +1,7 @@
 (
-cp ${SCRIPT_DIRECTORY}/lunar_install.locations ${SOURCE_DIRECTORY}/build/install.locations    && 
-./configure   &&
-make          &&
-make install
+    cp ${SCRIPT_DIRECTORY}/lunar_install.locations ${SOURCE_DIRECTORY}/build/install.locations    && 
+
+    default_build
+
 ) > $C_FIFO 2>&1
 

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/net/maradns/DETAILS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DETAILS	30 Jul 2003 23:03:22 -0000	1.1
+++ DETAILS	19 Jan 2004 12:58:39 -0000	1.2
@@ -1,12 +1,11 @@
           MODULE=maradns
-         VERSION=1.0.18
+         VERSION=1.0.20
           SOURCE=$MODULE-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-   SOURCE_URL[0]=http://maradns.3va.net/download/$SOURCE
-   SOURCE_URL[1]=http://www.maradns.org/download/$SOURCE
+      SOURCE_URL=http://www.maradns.org/download/$SOURCE
         WEB_SITE=http://www.maradns.org
          ENTERED=20030729
-         UPDATED=20030729
+         UPDATED=20040119
       MAINTAINER=nestu at lunar-linux.org
            SHORT="Secure and minimum resource DNS server."
 cat << EOF

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/net/maradns/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL	30 Jul 2003 23:03:22 -0000	1.1
+++ POST_INSTALL	19 Jan 2004 12:58:39 -0000	1.2
@@ -1,34 +1,18 @@
-finished=0
+MARARC=/etc/mararc
 
-until [ $finished -eq 1 ]; do
-    echo "What do you want to do?"
-    echo "1) set up a default recursive DNS server config file."
-    echo "2) set up a default full featured DNS server config file."
-    echo "3) finished."
-    
-    cd ${SOURCE_DIRECTORY}/doc/en/examples/ || { echo "Unable to enter ${SOURCE_DIRECTORY}/doc/en/examples directory" && exit 1; } 
-    
-    read answer
-    
-    case $answer in
-	1 ) 	echo "Setting up a default recursive config file at /etc/mararc"
-		cp example_recursive_mararc.txt /etc/mararc
-		echo "done."
-		finished=1
-		;;
+message "Setting up a default recursive config file at ${MARARC}"
+cp ${SOURCE_DIRECTORY}/doc/en/examples/example_recursive_mararc.txt ${MARARC} 
+echo "# Hide annoying disclaimer from mararc file" >> ${MARARC}
+echo  "hide_disclaimer=\"YES\" " >>  ${MARARC}
 
- 	2 )	echo "Setting up a default full featured config file at /etc/mararc"
-		cp example_full_mararc /etc/mararc
-		echo "done."
-	    	finished=1
-		;;
+if ! id -u maradns ; then
+    useradd maradns && 
+    echo "maradns user created"          
+fi
 
-	3 ) 	echo "done."
-		finished=1
-		;; # just quit
+MUID=`id -u maradns`	                                 &&
+sed -i "s/^maradns_uid.*/maradns_uid = $MUID/g" ${MARARC} &&
+message "maradns UID set in sample ${MARARC} file. Please do not change this variable."
+message "Do not forget to update firewall settings and resolv.conf if needed."
 
-    	* ) 	echo "$answer is not a valid selection. Please try again."
-		echo ""
-		;;
-    esac
-done
+    
\ No newline at end of file

Index: POST_REMOVE
===================================================================
RCS file: /var/cvs/lunar/moonbase/net/maradns/POST_REMOVE,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- POST_REMOVE	30 Jul 2003 23:30:35 -0000	1.2
+++ POST_REMOVE	19 Jan 2004 12:58:39 -0000	1.3
@@ -1,4 +1,3 @@
 rm /etc/mararc
 rm -rf /etc/maradns
-rm /etc/init.d/maradns
-
+userdel maradns

Index: lunar_install.locations
===================================================================
RCS file: /var/cvs/lunar/moonbase/net/maradns/lunar_install.locations,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lunar_install.locations	30 Jul 2003 23:03:22 -0000	1.1
+++ lunar_install.locations	19 Jan 2004 12:58:39 -0000	1.2
@@ -7,9 +7,9 @@
 # We allow the user to supply the prefix on the command line, e.g.
 # PREFIX=/usr/ ; make install
 # Thanks to D Richard Felker III for this suggestion
-
-BINDIR="/usr"
-DOCDIR="/usr/share"
+if [ -z "$PREFIX" ]; then
+	PREFIX="/usr/local"
+fi
 
 # Try to determine which language to use
 if [ -z "$LANGUAGE" ]; then
@@ -22,15 +22,17 @@
 fi
 
 # The location of programs that the end user may wish to use
-BIN="$BINDIR/bin/"
+BIN="$PREFIX/bin/"
 # The location of the server programs
-SBIN="$BINDIR/sbin/"
+SBIN="$PREFIX/sbin/"
+
+DOCS="/usr"
 # The directory to put man pages which describe the end-user programs
-MAN1="$DOCDIR/man/man1/"
+MAN1="$DOCS/man/man1/"
 # The directory to put man pages which describe configuration file formats
-MAN5="$DOCDIR/man/man5/"
+MAN5="$DOCS/man/man5/"
 # The directory to put man pages which describe the server programs
-MAN8="$DOCDIR/man/man8/"
+MAN8="$DOCS/man/man8/"
 # The directory to put a copy of the MaraDNS documents on the system
-DOCS="$DOCDIR/doc/maradns-$VERSION"
+DOCS="$DOCS/doc/maradns-$VERSION"