[Devil-linux-commit] build/scripts webmin,1.9,1.10

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21023/scripts

Modified Files:
	webmin 
Log Message:
removed webmin sysstats
it provides lots of challenges because of the r/o file system of DL. module
updates don't work right, etc.
postponing implementation of this module to some time in the future. there
are more important things for dl 1.4


Index: webmin
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/webmin,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- webmin	15 Nov 2009 13:42:45 -0000	1.9
+++ webmin	15 Nov 2009 16:12:22 -0000	1.10
@@ -9,7 +9,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       webmin
-# Required-Start: $basebuildtools $libs perl
+# Required-Start: $basebuildtools $libs perl cron
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -49,14 +49,6 @@
 		    tar -xjf $FILE || exit 1
 		done
 		
-		# unpack all the sub-modules of systats
-                for FILE in $(ls sysstats/modules/*gz)
-		do
-		    echo unpacking sysstats module $FILE
-		    tar -C sysstats/modules/ -xzf $FILE || exit 1
-		done
-		rm -f sysstats/modules/*gz
-	    
 	    # let's make sure we get all path names for perl fixed
 	    echo "Correcting path to perl"
 	    find -type f | xargs -n 10 perl -i -p -e 's%#!/usr/local/bin/perl%#!/usr/bin/perl%g'
@@ -68,18 +60,20 @@
 	if [ "$CONFIG_WEBMIN" = "y" ]; then
 	    rm acl/Authen-SolarisRBAC-0.1/blib/arch/auto/Authen/SolarisRBAC/SolarisRBAC.so
 	    rm acl/Authen-SolarisRBAC-0.1/SolarisRBAC.o
+	    rm -rf /usr/libexec/webmin || exit 1
+	    rm -rf $CDDIR/usr/libexec/webmin || exit 1
 	    mkdir -p $CDDIR/usr/libexec/webmin || exit 1
-	    mkdir -p $CDDIR/var/webmin || exit 1
+	    mkdir -p $CDDIR/var/webmin
 	    mkdir -p $ETCDIR/etc/pam.d || exit 1
 	    chown -R root * || exit 1
 	    chgrp -R bin * || exit 1
-	    cp -dpvR * $CDDIR/usr/libexec/webmin || exit 1
+	    cp -dpR * $CDDIR/usr/libexec/webmin || exit 1
 	    cp webmin-init $ETCDIR/etc/init.d/webmin || exit 1
 	    cp webmin-pam $ETCDIR/etc/pam.d/webmin || exit 1
 	    
 	    #install locally to get a good config to start with
 	    mkdir -p /usr/libexec/webmin || exit 1
-	    mkdir -p /var/webmin || exit 1
+	    mkdir -p /var/webmin
 	    cp -rpv * /usr/libexec/webmin || exit 1
 	    rm -rf /etc/webmin
 	    cd /usr/libexec/webmin || exit 1
@@ -114,13 +108,14 @@
 	    change_param /etc/webmin/dovecot/config init_script /etc/init.d/dovecot
 	    
 	    #configuring webmin sysstats
-	    for FILE in $(find sysstats/modules/ -name config.txt)
-	    do
-		RELFILE=${FILE/$(pwd)\///}
-		RELDIR=${RELFILE%/*}
-		mkdir $ETCDIR/etc/webmin/${RELDIR}
-		cp ${RELFILE} $ETCDIR/etc/webmin/${RELDIR}/config
-	    done
+	    #mkdir -p /etc/webmin/sysstats/modules
+	    #/usr/libexec/webmin/sysstats/batch_install.pl || exit 1
+	    #rm -rf $CDDIR/usr/libexec/webmin/sysstats/* || exit 1
+	    #cp -dpR /usr/libexec/webmin/sysstats $CDDIR/usr/libexec/webmin/ || exit 1
+	    #mkdir -p $CDDIR/var/webmin/sysstats/graphs || exit 1
+	    #chmod 770 $CDDIR/var/webmin/sysstats/graphs || exit 1
+	    #rm -rf $CDDIR/usr/libexec/webmin/sysstats/graphs || exit 1
+	    #ln -sf /var/webmin/sysstats/graphs $CDDIR/usr/libexec/webmin/sysstats/graphs || exit 1
 
 	    rm /etc/webmin/*cache
 	    cp -dpvR /etc/webmin $ETCDIR/etc/ || exit 1